X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/7fbd869e69b05b5d9c9050aaf636b6660b6ace7c..d0e1e19934b1c67a46a9b9c271b5054455edc5ad:/src/editor/modules/documentCanvas/canvas/utils.js?ds=sidebyside

diff --git a/src/editor/modules/documentCanvas/canvas/utils.js b/src/editor/modules/documentCanvas/canvas/utils.js
index 41a2a0a..4e262a0 100644
--- a/src/editor/modules/documentCanvas/canvas/utils.js
+++ b/src/editor/modules/documentCanvas/canvas/utils.js
@@ -3,13 +3,14 @@ define([
 ], function($) {
     
 'use strict';
-
+/* globals Node */
 
 var nearestInDocumentOrder = function(selector, direction, element) {
     var parents = $(element).parents(),
         parent = parents.length ? $(parents[parents.length-1]) : element;
 
     var adj = parent.find(selector).filter(function() {
+        /*jshint bitwise: false*/
         return this.compareDocumentPosition(element) & (direction === 'above' ? Node.DOCUMENT_POSITION_FOLLOWING : Node.DOCUMENT_POSITION_PRECEDING);
     });
 
@@ -17,39 +18,70 @@ var nearestInDocumentOrder = function(selector, direction, element) {
         return adj[direction === 'above' ? adj.length-1 : 0];
     }
     return null;
-}
+};
 
-var findCanvasElement = function(node) {
-    if(node.nodeType === Node.ELEMENT_NODE) {
-        return node.getData('canvasElement');
-    }
+var getElementForElementRootNode = function(node, withParent) {
     if(node.nodeType === Node.TEXT_NODE) {
-        return findCanvasElementInParent(node, node.parent())
+        return _getElementForRootTextNode(node, withParent);
     }
+    return node.getData('canvasElement');
 };
 
-/**
- * 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),
+var _getElementForRootTextNode = function(textNode, withParent) {
+    var parentElement = getElementForNode(withParent || textNode.parent()),
         toret;
-    parentElement.children().forEach(function(child) {
-        if(child.data('wlxmlNode').sameNode(wlxmlChildNode))
+    parentElement.children().some(function(child) {
+        if(child.wlxmlNode.sameNode(textNode)) {
             toret = child;
+            return true;
+        }
     });
     return toret;
-}
+};
+
+var getElementForNode = function(node, withParent) {
+    if(node.nodeType === Node.TEXT_NODE) {
+        return _getElementForTextNode(node, withParent);
+    }
+    while(!node.getData('canvasElement')) {
+        node = node.parent();
+    }
+    return node.getData('canvasElement');
+};
+
+var _getElementForTextNode = function(textNode, withParent) {
+    var parentElement = getElementForNode(withParent || textNode.parent()),
+        toret;
+    parentElement.children().some(function(child) {
+        if(child.wlxmlNode.sameNode(textNode)) {
+            toret = child;
+            return true;
+        }
+    });
+    return toret || parentElement;
+};
+
+var getElementForDetachedNode = function(node, originalParent) {
+    var ptr = originalParent;
+    if(ptr === null) {
+        return node.getData('canvasElement');
+    }
+    while(!ptr.getData('canvasElement')) {
+        ptr = ptr.parent();
+    }
+    return ptr.getData('canvasElement');
+};
+
+
 
 return {
     nearestInDocumentOrder: nearestInDocumentOrder,
-    findCanvasElement: findCanvasElement,
-    findTextElementInParent: findTextElementInParent,
     unicode: {
         ZWS: '\u200B'
-    }
+    },
+    getElementForNode: getElementForNode,
+    getElementForDetachedNode: getElementForDetachedNode,
+    getElementForElementRootNode: getElementForElementRootNode
 };
 
 });