clean up

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

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index 0d08aab..b82b471 100644 (file)
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -49,8 +49,10 @@ $.extend(DocumentElement.prototype, {
     },
 
     wrapWithNodeElement: function(wlxmlNode) {
     },
 
     wrapWithNodeElement: function(wlxmlNode) {

-        this.$element.wrap($('<' + wlxmlNode.tag + ' class="' + wlxmlNode.klass.replace('.', '-') + '">')[0]);
-        return documentElementFromHTMLElement(this.$element.parent().get(0), this.canvas);
+        var wrapper = DocumentNodeElement.create({tag: wlxmlNode.tag, klass: wlxmlNode.klass});
+        this.$element.replaceWith(wrapper.dom());
+        wrapper.append(this);
+        return wrapper;

     },
 
     childIndex: function(child) {
     },
 
     childIndex: function(child) {


@@ -105,8 +107,23 @@ $.extend(DocumentNodeElement.prototype, {
     after: function(params) {
         manipulate(this, params, 'after');
     },
     after: function(params) {
         manipulate(this, params, 'after');
     },

+    getWlxmlTag: function() {
+        return this.$element.attr('wlxml-tag');
+    },
+    setWlxmlTag: function(tag) {
+        this.$element.attr('wlxml-tag', tag);
+    },
+    getWlxmlClass: function() {
+        var klass = this.$element.attr('wlxml-class');
+        if(klass)
+            return klass.replace('-', '.');
+        return undefined;
+    },

     setWlxmlClass: function(klass) {
     setWlxmlClass: function(klass) {

-        this.$element.attr('class', klass);
+        if(klass)
+            this.$element.attr('wlxml-class', klass);
+        else
+            this.$element.removeAttr('wlxml-class');

     },
     is: function(what) {
         if(what === 'list' && _.contains(['list-items', 'list-items-enum'], this.$element.attr('wlxml-class')))
     },
     is: function(what) {
         if(what === 'list' && _.contains(['list-items', 'list-items-enum'], this.$element.attr('wlxml-class')))


@@ -169,18 +186,25 @@ $.extend(DocumentTextElement.prototype, {
         return documentElementFromHTMLElement(dom[0]);
     },
     wrapWithNodeElement: function(wlxmlNode) {
         return documentElementFromHTMLElement(dom[0]);
     },
     wrapWithNodeElement: function(wlxmlNode) {

-        if(wlxmlNode.start && wlxmlNode.end) {
+        if(typeof wlxmlNode.start === 'number' && typeof wlxmlNode.end === 'number') {

             return this.canvas.wrapText({
                 inside: this.parent(),
                 textNodeIdx: this.parent().childIndex(this),
             return this.canvas.wrapText({
                 inside: this.parent(),
                 textNodeIdx: this.parent().childIndex(this),

-                offsetStart: wlxmlNode.start,
-                offsetEnd: wlxmlNode.end,
+                offsetStart: Math.min(wlxmlNode.start, wlxmlNode.end),
+                offsetEnd: Math.max(wlxmlNode.start, wlxmlNode.end),

                 _with: {tag: wlxmlNode.tag, klass: wlxmlNode.klass}
             });
         } else {
             return DocumentElement.prototype.wrapWithNodeElement.call(this, wlxmlNode);
         }
     },
                 _with: {tag: wlxmlNode.tag, klass: wlxmlNode.klass}
             });
         } else {
             return DocumentElement.prototype.wrapWithNodeElement.call(this, wlxmlNode);
         }
     },

+    unwrap: function() {
+        if(this.parent().children().length === 1) {
+            var parent = this.parent();
+            parent.after(this);
+            parent.detach();
+        }
+    },

     split: function(params) {
         var parentElement = this.parent(),
             myIdx = parentElement.childIndex(this),
     split: function(params) {
         var parentElement = this.parent(),
             myIdx = parentElement.childIndex(this),