X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/7fbd869e69b05b5d9c9050aaf636b6660b6ace7c..e104b4b87dc39066cbe397984c6f0e6bcc0459f8:/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 41a2a0a..058ede8 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,40 @@ var nearestInDocumentOrder = function(selector, direction, element) {
         return adj[direction === 'above' ? adj.length-1 : 0];
     }
     return null;
-}
+};
+
+var getElementForElementRootNode = function(node) {
+    return node.getData('canvasElement');
+};
+
+var getElementForNode = function(node) {
+    while(!node.getData('canvasElement')) {
+        node = node.parent();
+    }
+    return node.getData('canvasElement');
+};
 
-var findCanvasElement = function(node) {
-    if(node.nodeType === Node.ELEMENT_NODE) {
+var getElementForDetachedNode = function(node, originalParent) {
+    var ptr = originalParent;
+    if(ptr === null) {
         return node.getData('canvasElement');
     }
-    if(node.nodeType === Node.TEXT_NODE) {
-        return findCanvasElementInParent(node, node.parent())
+    while(!ptr.getData('canvasElement')) {
+        ptr = ptr.parent();
     }
+    return ptr.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),
-        toret;
-    parentElement.children().forEach(function(child) {
-        if(child.data('wlxmlNode').sameNode(wlxmlChildNode))
-            toret = child;
-    });
-    return toret;
-}
+
 
 return {
     nearestInDocumentOrder: nearestInDocumentOrder,
-    findCanvasElement: findCanvasElement,
-    findTextElementInParent: findTextElementInParent,
     unicode: {
         ZWS: '\u200B'
-    }
+    },
+    getElementForNode: getElementForNode,
+    getElementForDetachedNode: getElementForDetachedNode,
+    getElementForElementRootNode: getElementForElementRootNode
 };
 
 });