Represent empty wlxml nodes as DocumentNodeElement with empty DocumentTextElement

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

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index e76ba78..0558a3e 100644 (file)
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -74,18 +74,12 @@ $.extend(DocumentElement.prototype, {
     },
 
     wrapWithNodeElement: function(wlxmlNode) {
     },
 
     wrapWithNodeElement: function(wlxmlNode) {

-        var wrapper = DocumentNodeElement.create({tag: wlxmlNode.tag, klass: wlxmlNode.klass});
+        var wrapper = DocumentNodeElement.create({tag: wlxmlNode.tag, klass: wlxmlNode.klass}, this);

         this.dom().replaceWith(wrapper.dom());
         wrapper.append(this);
         return wrapper;
     },
 
         this.dom().replaceWith(wrapper.dom());
         wrapper.append(this);
         return wrapper;
     },
 

-    detach: function() {
-        this.dom().detach();
-        this.canvas = null;
-        return this;
-    },
-

     markAsCurrent: function() {
         this.canvas.markAsCurrent(this);
     },
     markAsCurrent: function() {
         this.canvas.markAsCurrent(this);
     },


@@ -109,6 +103,18 @@ $.extend(DocumentElement.prototype, {
 
     isVisible: function() {
         return this instanceof DocumentTextElement || this.getWlxmlTag() !== 'metadata';
 
     isVisible: function() {
         return this instanceof DocumentTextElement || this.getWlxmlTag() !== 'metadata';

+    },
+
+    isInsideList: function() {
+        return this.parents().some(function(parent) {
+            return parent.is('list');
+        });
+    },
+
+    exec: function(method) {
+        var manager = this.data('_wlxmlManager');
+        if(manager[method])
+            return manager[method].apply(manager, Array.prototype.slice.call(arguments, 1));

     }
 });
 
     }
 });
 


@@ -134,9 +140,7 @@ $.extend(DocumentNodeElement, {
 
         var element = this.fromHTMLElement(dom[0], canvas);
 
 
         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]);
         if(params.meta) {
             _.keys(params.meta).forEach(function(key) {
                 element.setWlxmlMetaAttr(key, params.meta[key]);


@@ -144,8 +148,10 @@ $.extend(DocumentNodeElement, {
         }
         element.data('other-attrs', params.others);
 
         }
         element.data('other-attrs', params.others);
 

-        if(params.rawChildren) {
+        if(params.rawChildren && params.rawChildren.length) {

             container.append(params.rawChildren);
             container.append(params.rawChildren);

+        } else if(params.prepopulateOnEmpty) {
+            element.append(DocumentTextElement.create({text: ''}));

         }
         return dom;
     },
         }
         return dom;
     },


@@ -178,6 +184,24 @@ $.extend(DocumentNodeElement.prototype, {
     _container: function() {
         return this.dom().children('[document-element-content]');
     },
     _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);
     data: function() {
         var dom = this.dom(),
             args = Array.prototype.slice.call(arguments, 0);


@@ -309,7 +333,8 @@ $.extend(DocumentNodeElement.prototype, {
             return;
 
         this._container().attr('wlxml-tag', tag);
             return;
 
         this._container().attr('wlxml-tag', tag);

-        this._updateWlxmlManager();
+        if(!this.__updatingWlxml)
+            this._updateWlxmlManager();

     },
     getWlxmlClass: function() {
         var klass = this._container().attr('wlxml-class');
     },
     getWlxmlClass: function() {
         var klass = this._container().attr('wlxml-class');


@@ -330,7 +355,17 @@ $.extend(DocumentNodeElement.prototype, {
             this._container().attr('wlxml-class', klass.replace(/\./g, '-'));
         else
             this._container().removeAttr('wlxml-class');
             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._updateWlxmlManager();

+        this.__updatingWlxml = false;

     },
     _updateWlxmlManager: function() {
         var manager = wlxmlManagers.getFor(this);
     },
     _updateWlxmlManager: function() {
         var manager = wlxmlManagers.getFor(this);


@@ -367,8 +402,8 @@ $.extend(DocumentNodeElement.prototype, {
         this.toggleHighlight(toggle);
     },
 
         this.toggleHighlight(toggle);
     },
 

-    toggleHighlight: function(toogle) {
-        this._container().toggleClass('highlighted-element');
+    toggleHighlight: function(toggle) {
+        this._container().toggleClass('highlighted-element', toggle);

     },
 
     toggle: function(toggle) {
     },
 
     toggle: function(toggle) {


@@ -417,9 +452,17 @@ $.extend(DocumentTextElement.prototype, {
         else
             this.$element = $element;
     },
         else
             this.$element = $element;
     },

+    detach: function() {
+        this.dom().detach();
+        this.canvas = null;
+        return this;
+    },

     setText: function(text) {
         this.dom().contents()[0].data = text;
     },
     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, '');
     },
     getText: function() {
         return this.dom().text().replace(utils.unicode.ZWS, '');
     },


@@ -479,12 +522,17 @@ $.extend(DocumentTextElement.prototype, {
                     idx = grandParent.childIndex(parent),
                     prev = idx - 1 > -1 ? grandParentChildren[idx-1] : null,
                     next = idx + 1 < grandParentChildren.length ? grandParentChildren[idx+1] : null;
                     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();
                 } else if (prev || next) {
                 if(prev && next) {
                     prev.setText(prev.getText() + this.getText() + next.getText());
                     next.detach();
                 } else if (prev || next) {

-                    var target = prev ? prev : next;
-                    target.setText(target.getText() + this.getText());
+                    var target = prev ? prev : next,
+                        newText = prev ? target.getText() + this.getText() : this.getText() + target.getText();
+                    target.setText(newText);

                 } else {
                     parent.after(this);
                 }
                 } else {
                     parent.after(this);
                 }