Refactoring: getting rid of old 'test3' regexp for tests lookup

[fnpeditor.git] / modules / documentCanvas / canvas / documentElement.js

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index 7ca7e59..1a10c1a 100644 (file)
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -47,7 +47,7 @@ $.extend(DocumentElement.prototype, {
         this.$element = $(htmlElement);
     },
     bound: function() {
         this.$element = $(htmlElement);
     },
     bound: function() {

-        return this.canvas !== undefined;
+        return $.contains(document.documentElement, this.dom()[0]);

     },
     dom: function() {
         return this.$element;
     },
     dom: function() {
         return this.$element;


@@ -228,18 +228,23 @@ $.extend(DocumentNodeElement.prototype, {
         if(myChildren.length === 0)
             return this.detach();
 
         if(myChildren.length === 0)
             return this.detach();
 

-        var moveLeftRange, moveRightRange;
+        var moveLeftRange, moveRightRange, leftMerged;

 
         if(myIdx > 0 && (parentChildren[myIdx-1] instanceof DocumentTextElement) && (myChildren[0] instanceof DocumentTextElement)) {
             parentChildren[myIdx-1].appendText(myChildren[0].getText());
             myChildren[0].detach();
             moveLeftRange = true;
 
         if(myIdx > 0 && (parentChildren[myIdx-1] instanceof DocumentTextElement) && (myChildren[0] instanceof DocumentTextElement)) {
             parentChildren[myIdx-1].appendText(myChildren[0].getText());
             myChildren[0].detach();
             moveLeftRange = true;

+            leftMerged = true;
+        } else {
+            leftMerged = false;

         }
 
         }
 

-        if(myIdx < parentChildren.length - 1 && (parentChildren[parentChildren.length-1] instanceof DocumentTextElement) && (myChildren[myChildren.length-1] instanceof DocumentTextElement)) {
-            parentChildren[parentChildren.length-1].prependText(myChildren[myChildren.length-1].getText());
-            myChildren[myChildren.length-1].detach();
-            moveRightRange = true;
+        if(!(leftMerged && myChildren.length === 1)) {
+            if(myIdx < parentChildren.length - 1 && (parentChildren[myIdx+1] instanceof DocumentTextElement) && (myChildren[myChildren.length-1] instanceof DocumentTextElement)) {
+                parentChildren[myIdx+1].prependText(myChildren[myChildren.length-1].getText());
+                myChildren[myChildren.length-1].detach();
+                moveRightRange = true;
+            }

         }
 
         var childrenLength = this.children().length;
         }
 
         var childrenLength = this.children().length;