Squashed 'libs/editor/' changes from 10ae495..2c183ac

2c183ac Merge pull request #397 from wordpress-mobile/issue/396-wrapinparagraph-null-error d3216df Fix #396: null closerParentNode in wrapCaretInParagraphIfNecessary git-subtree-dir: libs/editor git-subtree-split: 2c183acd48dd31b1ca0e6820dae09b02fa12110e
wordpress-mobile · Jun 3, 2016 · e8a087f · e8a087f
1 parent 961a76c
commit e8a087f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/libs/editor-common/assets/ZSSRichTextEditor.js b/libs/editor-common/assets/ZSSRichTextEditor.js
@@ -3553,9 +3553,13 @@ ZSSField.prototype.disableEditing = function () {
  *  @details    A parent paragraph node should be added if the current parent is either the field
  *              node itself, or a blockquote node.
  */
-ZSSField.prototype.wrapCaretInParagraphIfNecessary = function()
-{
+ZSSField.prototype.wrapCaretInParagraphIfNecessary = function() {
     var closerParentNode = ZSSEditor.closerParentNode();
+
+    if (closerParentNode == null) {
+        return;
+    }
+
     var parentNodeShouldBeParagraph = (closerParentNode == this.getWrappedDomNode()
                                        || closerParentNode.nodeName == NodeName.BLOCKQUOTE);