prevent empty span in a new node

[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 1df3f82..620e652 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/utils.js
+++ b/src/editor/modules/documentCanvas/canvas/utils.js
@@ -20,47 +20,17 @@ var nearestInDocumentOrder = function(selector, direction, element) {
     return null;
 };
 
-var getElementForElementRootNode = function(node, withParent) {
-    if(node.nodeType === Node.TEXT_NODE) {
-        return _getElementForRootTextNode(node, withParent);
-    }
+var getElementForElementRootNode = function(node) {
     return node.getData('canvasElement');
 };
 
-var _getElementForRootTextNode = 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;
-};
-
-var getElementForNode = function(node, withParent) {
-    if(node.nodeType === Node.TEXT_NODE) {
-        return _getElementForTextNode(node, withParent);
-    }
+var getElementForNode = function(node) {
     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;
-};
-
 var getElementForDetachedNode = function(node, originalParent) {
     var ptr = originalParent;
     if(ptr === null) {
@@ -72,6 +42,23 @@ var getElementForDetachedNode = function(node, originalParent) {
     return ptr.getData('canvasElement');
 };
 
+var caretPositionFromPoint = function(x, y) {
+    /* globals document */
+    var range, textNode, offset;
+    if(document.caretPositionFromPoint) {
+        range = document.caretPositionFromPoint(x, y);
+        textNode = range.offsetNode;
+        offset = range.offset;
+    } else if(document.caretRangeFromPoint) {
+        range = document.caretRangeFromPoint(x, y);
+        textNode = range.startContainer;
+        offset = range.startOffset;
+    }
+    return {
+        textNode: textNode,
+        offset: offset
+    };
+};
 
 
 return {
@@ -81,7 +68,8 @@ return {
     },
     getElementForNode: getElementForNode,
     getElementForDetachedNode: getElementForDetachedNode,
-    getElementForElementRootNode: getElementForElementRootNode
+    getElementForElementRootNode: getElementForElementRootNode,
+    caretPositionFromPoint: caretPositionFromPoint
 };
 
 });