editor: minor refactoring

[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 9f5ee46..058ede8 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/utils.js
+++ b/src/editor/modules/documentCanvas/canvas/utils.js
@@ -3,7 +3,7 @@ define([
 ], function($) {
     
 'use strict';
 ], function($) {
     
 'use strict';

-
+/* globals Node */

 
 var nearestInDocumentOrder = function(selector, direction, element) {
     var parents = $(element).parents(),
 
 var nearestInDocumentOrder = function(selector, direction, element) {
     var parents = $(element).parents(),


@@ -20,38 +20,38 @@ var nearestInDocumentOrder = function(selector, direction, element) {
     return null;
 };
 
     return null;
 };
 

-var findCanvasElement = function(node) {
-    if(node.nodeType === Node.ELEMENT_NODE) {
+var getElementForElementRootNode = function(node) {
+    return node.getData('canvasElement');
+};
+
+var getElementForNode = function(node) {
+    while(!node.getData('canvasElement')) {
+        node = node.parent();
+    }
+    return node.getData('canvasElement');
+};
+
+var getElementForDetachedNode = function(node, originalParent) {
+    var ptr = originalParent;
+    if(ptr === null) {

         return node.getData('canvasElement');
     }
         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,
 
 return {
     nearestInDocumentOrder: nearestInDocumentOrder,

-    findCanvasElement: findCanvasElement,
-    findCanvasElementInParent: findCanvasElementInParent,

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

-    }
+    },
+    getElementForNode: getElementForNode,
+    getElementForDetachedNode: getElementForDetachedNode,
+    getElementForElementRootNode: getElementForElementRootNode

 };
 
 });
 };
 
 });