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 87911cf..058ede8 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/utils.js
+++ b/src/editor/modules/documentCanvas/canvas/utils.js
@@ -3,13 +3,14 @@ define([
 ], function($) {
     
 'use strict';
 ], 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() {
 
 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);
     });
 
         return this.compareDocumentPosition(element) & (direction === 'above' ? Node.DOCUMENT_POSITION_FOLLOWING : Node.DOCUMENT_POSITION_PRECEDING);
     });
 


@@ -17,31 +18,40 @@ var nearestInDocumentOrder = function(selector, direction, element) {
         return adj[direction === 'above' ? adj.length-1 : 0];
     }
     return null;
         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');
     }
         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;
+    while(!ptr.getData('canvasElement')) {
+        ptr = ptr.parent();

     }
     }

+    return ptr.getData('canvasElement');

 };
 
 };
 

+
+

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

-    findCanvasElement: findCanvasElement,

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

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

 };
 
 });
 };
 
 });