Fix breaking out of <p> when deleting across paragraphs in FF

package.json

@@ -13,7 +13,7 @@
     "plumber-write": "~0.2.0",
     "q": "~1.0.0",
     "request": "~2.33.0",
-    "selenium-webdriver": "~2.37.0"
+    "selenium-webdriver": "^2.41.0"
   },
   "scripts": {
     "test": "node test/runner",

setup.sh

@@ -2,7 +2,7 @@ npm install
 bower install
 
 # Download the selenium JAR
-SELENIUM_VERSION=2.37.0
+SELENIUM_VERSION=2.41.0
 mkdir -p vendor
 wget -O vendor/selenium-server-standalone-$SELENIUM_VERSION.jar \
-  https://selenium.googlecode.com/files/selenium-server-standalone-$SELENIUM_VERSION.jar
+  https://selenium-release.storage.googleapis.com/2.41/selenium-server-standalone-$SELENIUM_VERSION.jar

src/plugins/core/commands.js

@@ -1,6 +1,5 @@
 define([
   './commands/indent',
-  './commands/insert-html',
   './commands/insert-list',
   './commands/outdent',
   './commands/redo',
@@ -9,7 +8,6 @@ define([
   './commands/undo'
 ], function (
   indent,
-  insertHTML,
   insertList,
   outdent,
   redo,
@@ -22,7 +20,6 @@ define([
 
   return {
     indent: indent,
-    insertHTML: insertHTML,
     insertList: insertList,
     outdent: outdent,
     redo: redo,

src/plugins/core/enforce-p-elements.js

@@ -0,0 +1,119 @@
+define([
+  'lodash-modern/arrays/last',
+  'lodash-modern/collections/contains'
+], function (
+  last,
+  contains
+) {
+
+  /**
+   * Chrome and Firefox: Upon pressing backspace inside of a P, the browser
+   * deletes the paragraph element, leaving the scribe in a pristine state.
+   *
+   * Firefox: Erasing across multiple paragraphs, or outside of a
+   * whole paragraph (e.g. by ‘Select All’) will leave the scribe in a
+   * pristine state.
+   *
+   * Entering a new line in a pristine state state will insert
+   * `<div>`s (in Chrome) or `<br>`s (in Firefox) where previously we
+   * had `<p>`'s. This patches the behaviour of delete/backspace so
+   * that we do not end up in a pristine state.
+   */
+
+  'use strict';
+
+
+  // TODO: not exhaustive?
+  var blockElementNames = ['P', 'LI', 'DIV', 'BLOCKQUOTE', 'UL', 'OL', 'H2'];
+  function isBlockElement(node) {
+    return contains(blockElementNames, node.nodeName);
+  }
+
+  /**
+   * Wrap consecutive inline elements and text nodes in a P element.
+   */
+  function wrapChildNodes(parentNode) {
+    var groups = Array.prototype.reduce.call(parentNode.childNodes,
+                                             function (accumulator, binChildNode) {
+      var group = last(accumulator);
+      if (! group) {
+        startNewGroup();
+      } else {
+        var isBlockGroup = isBlockElement(group[0]);
+        if (isBlockGroup === isBlockElement(binChildNode)) {
+          group.push(binChildNode);
+        } else {
+          startNewGroup();
+        }
+      }
+
+      return accumulator;
+
+      function startNewGroup() {
+        var newGroup = [binChildNode];
+        accumulator.push(newGroup);
+      }
+    }, []);
+
+    var consecutiveInlineElementsAndTextNodes = groups.filter(function (group) {
+      var isBlockGroup = isBlockElement(group[0]);
+      return ! isBlockGroup;
+    });
+
+    consecutiveInlineElementsAndTextNodes.forEach(function (nodes) {
+      var pElement = document.createElement('p');
+      nodes[0].parentNode.insertBefore(pElement, nodes[0]);
+      nodes.forEach(function (node) {
+        pElement.appendChild(node);
+      });
+    });
+
+    parentNode._isWrapped = true;
+  }
+
+  // Traverse the tree, wrapping child nodes as we go.
+  function traverse(parentNode) {
+    var treeWalker = document.createTreeWalker(parentNode, NodeFilter.SHOW_ELEMENT);
+    var node = treeWalker.firstChild();
+
+    // FIXME: does this recurse down?
+
+    while (node) {
+      // TODO: At the moment we only support BLOCKQUOTEs. See failing
+      // tests.
+      if (node.nodeName === 'BLOCKQUOTE' && ! node._isWrapped) {
+        wrapChildNodes(node);
+        traverse(parentNode);
+        break;
+      }
+      node = treeWalker.nextSibling();
+    }
+  }
+
+
+  return function () {
+    return function (scribe) {
+
+      scribe.htmlFormatter.formatters.push(function (html) {
+        /**
+         * Ensure P mode.
+         *
+         * Wrap any orphan text nodes in a P element.
+         */
+        // TODO: This should be configurable and also correct markup such as
+        // `<ul>1</ul>` to <ul><li>2</li></ul>`. See skipped tests.
+        // TODO: This should probably be a part of HTML Janitor, or some other
+        // formatter.
+        var bin = document.createElement('div');
+        bin.innerHTML = html;
+
+        wrapChildNodes(bin);
+        traverse(bin);
+
+        return bin.innerHTML;
+      });
+
+    };
+  };
+
+});

src/plugins/core/patches.js

@@ -4,15 +4,13 @@ define([
   './patches/commands/insert-html',
   './patches/commands/insert-list',
   './patches/commands/outdent',
-  './patches/empty-when-deleting',
   './patches/events'
 ], function (
   boldCommand,
   indentCommand,
   insertHTMLCommand,
   insertListCommands,
   outdentCommand,
-  emptyWhenDeleting,
   events
 ) {
 
@@ -32,7 +30,6 @@ define([
       insertList: insertListCommands,
       outdent: outdentCommand
     },
-    emptyWhenDeleting: emptyWhenDeleting,
     events: events
   };