X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/b65f1bbd3863db4164c3b7283e187460ccdf2504..f0a4549eb9a1adc546f31c3e8b0c5958fbc28edd:/modules/documentCanvas/canvas/documentElement.js?ds=inline

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index 0cf2e2c..4a236df 100644
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -46,6 +46,9 @@ $.extend(DocumentElement.prototype, {
     _setupDOMHandler: function(htmlElement) {
         this.$element = $(htmlElement);
     },
+    bound: function() {
+        return this.canvas !== undefined;
+    },
     dom: function() {
         return this.$element;
     },
@@ -77,11 +80,6 @@ $.extend(DocumentElement.prototype, {
         return wrapper;
     },
 
-    detach: function() {
-        this.dom().detach();
-        this.canvas = null;
-    },
-
     markAsCurrent: function() {
         this.canvas.markAsCurrent(this);
     },
@@ -115,7 +113,7 @@ var DocumentNodeElement = function(htmlElement, canvas) {
 };
 
 $.extend(DocumentNodeElement, {
-    createDOM: function(params) {
+    createDOM: function(params, canvas) {
         var dom = $('<div>')
                 .attr('document-node-element', ''),
             widgetsContainer = $('<div>')
@@ -128,7 +126,7 @@ $.extend(DocumentNodeElement, {
         // Make sure widgets aren't navigable with arrow keys
         widgetsContainer.find('*').add(widgetsContainer).attr('tabindex', -1);
 
-        var element = this.fromHTMLElement(dom[0]);
+        var element = this.fromHTMLElement(dom[0], canvas);
 
         element.setWlxmlTag(params.tag);
         if(params.klass)
@@ -147,7 +145,7 @@ $.extend(DocumentNodeElement, {
     },
 
     create: function(params, canvas) {
-        return this.fromHTMLElement(this.createDOM(params)[0]);
+        return this.fromHTMLElement(this.createDOM(params, canvas)[0], canvas);
     },
 
     fromHTMLElement: function(htmlElement, canvas) {
@@ -162,7 +160,7 @@ var manipulate = function(e, params, action) {
     } else {
         element = DocumentElement.create(params);
     }
-    var target = action === 'append' ? e._container() : e.dom();
+    var target = (action === 'append' || action === 'prepend') ? e._container() : e.dom();
     target[action](element.dom());
     return element;
 };
@@ -174,6 +172,24 @@ $.extend(DocumentNodeElement.prototype, {
     _container: function() {
         return this.dom().children('[document-element-content]');
     },
+    detach: function() {
+        var parent = this.parent();
+        if(!parent)
+            return;
+
+        var parentChildren = parent.children(),
+            myIdx = parent.childIndex(this);
+
+        if(myIdx > 0 && myIdx < parentChildren.length) {
+            if((parentChildren[myIdx-1] instanceof DocumentTextElement) && (parentChildren[myIdx+1] instanceof DocumentTextElement)) {
+                parentChildren[myIdx-1].appendText(parentChildren[myIdx+1].getText());
+                parentChildren[myIdx+1].detach();
+            }
+        }
+        this.dom().detach();
+        this.canvas = null;
+        return this;
+    },
     data: function() {
         var dom = this.dom(),
             args = Array.prototype.slice.call(arguments, 0);
@@ -254,6 +270,9 @@ $.extend(DocumentNodeElement.prototype, {
             this.data('orig-end', undefined);
         return manipulate(this, params, 'append');
     },
+    prepend: function(params) {
+        return manipulate(this, params, 'prepend');
+    },
     before: function(params) {
         return manipulate(this, params, 'before');
 
@@ -360,8 +379,15 @@ $.extend(DocumentNodeElement.prototype, {
         this.toggleHighlight(toggle);
     },
 
-    toggleHighlight: function(toogle) {
-        this._container().toggleClass('highlighted-element');
+    toggleHighlight: function(toggle) {
+        this._container().toggleClass('highlighted-element', toggle);
+    },
+
+    toggle: function(toggle) {
+        var mng = this.data('_wlxmlManager');
+        if(mng) {
+            mng.toggle(toggle);
+        }
     }
 });
 
@@ -403,9 +429,17 @@ $.extend(DocumentTextElement.prototype, {
         else
             this.$element = $element;
     },
+    detach: function() {
+        this.dom().detach();
+        this.canvas = null;
+        return this;
+    },
     setText: function(text) {
         this.dom().contents()[0].data = text;
     },
+    appendText: function(text) {
+        this.dom().contents()[0].data += text;
+    },
     getText: function() {
         return this.dom().text().replace(utils.unicode.ZWS, '');
     },
@@ -420,7 +454,7 @@ $.extend(DocumentTextElement.prototype, {
         if(params instanceof DocumentNodeElement) {
             element = params;
         } else {
-            element = DocumentNodeElement.create(params);
+            element = DocumentNodeElement.create(params, this.canvas);
         }
         this.dom().wrap('<div>');
         this.dom().parent().after(element.dom());
@@ -434,7 +468,7 @@ $.extend(DocumentTextElement.prototype, {
         if(params instanceof DocumentNodeElement) {
             element = params;
         } else {
-            element = DocumentNodeElement.create(params);
+            element = DocumentNodeElement.create(params, this.canvas);
         }
         this.dom().wrap('<div>');
         this.dom().parent().before(element.dom());
@@ -465,6 +499,10 @@ $.extend(DocumentTextElement.prototype, {
                     idx = grandParent.childIndex(parent),
                     prev = idx - 1 > -1 ? grandParentChildren[idx-1] : null,
                     next = idx + 1 < grandParentChildren.length ? grandParentChildren[idx+1] : null;
+                
+                prev = (prev instanceof DocumentTextElement) ? prev : null;
+                next = (next instanceof DocumentTextElement) ? next : null;
+
                 if(prev && next) {
                     prev.setText(prev.getText() + this.getText() + next.getText());
                     next.detach();