Fix: Missing contentChange event on typing

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

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index 9768236..4d74722 100644 (file)
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -80,11 +80,6 @@ $.extend(DocumentElement.prototype, {
         return wrapper;
     },
 
-    detach: function() {
-        this.dom().detach();
-        this.canvas = null;
-    },
-
     markAsCurrent: function() {
         this.canvas.markAsCurrent(this);
     },
@@ -133,9 +128,7 @@ $.extend(DocumentNodeElement, {
 
         var element = this.fromHTMLElement(dom[0], canvas);
 
-        element.setWlxmlTag(params.tag);
-        if(params.klass)
-            element.setWlxmlClass(params.klass);
+        element.setWlxml({tag: params.tag, klass: params.klass});
         if(params.meta) {
             _.keys(params.meta).forEach(function(key) {
                 element.setWlxmlMetaAttr(key, params.meta[key]);
@@ -177,6 +170,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);
@@ -308,7 +319,8 @@ $.extend(DocumentNodeElement.prototype, {
             return;
 
         this._container().attr('wlxml-tag', tag);
-        this._updateWlxmlManager();
+        if(!this.__updatingWlxml)
+            this._updateWlxmlManager();
     },
     getWlxmlClass: function() {
         var klass = this._container().attr('wlxml-class');
@@ -329,7 +341,17 @@ $.extend(DocumentNodeElement.prototype, {
             this._container().attr('wlxml-class', klass.replace(/\./g, '-'));
         else
             this._container().removeAttr('wlxml-class');
+        if(!this.__updatingWlxml)
+            this._updateWlxmlManager();
+    },
+    setWlxml: function(params) {
+        this.__updatingWlxml = true;
+        if(params.tag !== undefined)
+            this.setWlxmlTag(params.tag);
+        if(params.klass !== undefined)
+            this.setWlxmlClass(params.klass);
         this._updateWlxmlManager();
+        this.__updatingWlxml = false;
     },
     _updateWlxmlManager: function() {
         var manager = wlxmlManagers.getFor(this);
@@ -366,8 +388,8 @@ $.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) {
@@ -416,9 +438,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, '');
     },
@@ -478,6 +508,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();