handle situation when nothing was actually unwrapped

[fnpeditor.git] / src / editor / modules / documentCanvas / canvas / utils.js

diff --git a/src/editor/modules/documentCanvas/canvas/utils.js b/src/editor/modules/documentCanvas/canvas/utils.js
index 87911cf..327b0b0 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/utils.js
+++ b/src/editor/modules/documentCanvas/canvas/utils.js
@@ -24,21 +24,29 @@ var findCanvasElement = function(node) {
         return node.getData('canvasElement');
     }
     if(node.nodeType === Node.TEXT_NODE) {
         return node.getData('canvasElement');
     }
     if(node.nodeType === Node.TEXT_NODE) {

-        var parent = node.parent(),
-            toret;
-
-        parent.children().forEach(function(child) {
-            if(child.data('wlxmlNode').sameNode(node))
-                toret = child;
-        });
-        if(toret)
-            return toret;
+        return findCanvasElementInParent(node, node.parent())

     }
 };
 
     }
 };
 

+/**
+ * We take child and its parent as arguments separatly to
+ * handle situation where child was removed from WLXMLDocument
+ * and it lost reference to its parent (but we may still have it on canvas).
+*/
+var findCanvasElementInParent = function(wlxmlChildNode, wlxmlParentNode) {
+    var parentElement = findCanvasElement(wlxmlParentNode),
+        toret;
+    parentElement.children().forEach(function(child) {
+        if(child.data('wlxmlNode').sameNode(wlxmlChildNode))
+            toret = child;
+    });
+    return toret;
+}
+

 return {
     nearestInDocumentOrder: nearestInDocumentOrder,
     findCanvasElement: findCanvasElement,
 return {
     nearestInDocumentOrder: nearestInDocumentOrder,
     findCanvasElement: findCanvasElement,

+    findCanvasElementInParent: findCanvasElementInParent,

     unicode: {
         ZWS: '\u200B'
     }
     unicode: {
         ZWS: '\u200B'
     }