Rearranging document toolbar icons

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

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index f2ef09c..b82b471 100644 (file)
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -186,18 +186,25 @@ $.extend(DocumentTextElement.prototype, {
         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),
-                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);
         }
     },
+    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),