X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/723ac1f3c7cd74605ea7103d7738daad92772515..72dfc92f908add69b4d862e9b6c3107e2a8acd21:/modules/documentCanvas/canvas/documentElement.js?ds=sidebyside

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index d0adbc0..82a85c7 100644
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -18,55 +18,26 @@ $.extend(DocumentElement.prototype, {
     dom: function() {
         return this.$element;
     },
-    children: function() {
-        var toret = [];
-        if(this instanceof DocumentTextElement)
-            return toret;
-
-
-        var elementContent = this.$element.contents();
-        var element = this;
-        elementContent.each(function(idx) {
-            var childElement = documentElementFromHTMLElement(this, element.canvas);
-            if(idx === 0 && elementContent.length > 1 && elementContent[1].nodeType === Node.ELEMENT_NODE && (childElement instanceof DocumentTextElement) && $.trim($(this).text()) === '')
-                return true;
-            if(idx > 0 && childElement instanceof DocumentTextElement) {
-                if(toret[toret.length-1] instanceof DocumentNodeElement && $.trim($(this).text()) === '')
-                    return true;
-            }
-            toret.push(childElement);
-        });
-        return toret;
-    },
     parent: function() {
-        return documentElementFromHTMLElement(this.$element.parent()[0], this.canvas);
+        var parents = this.$element.parents('[wlxml-tag]');
+        if(parents.length)
+            return documentElementFromHTMLElement(parents[0], this.canvas);
+        return null;
     },
 
     sameNode: function(other) {
-        return other && (typeof other === typeof this) && other.$element[0] === this.$element[0];
+        return other && (typeof other === typeof this) && other.dom()[0] === this.dom()[0];
     },
 
     wrapWithNodeElement: function(wlxmlNode) {
         var wrapper = DocumentNodeElement.create({tag: wlxmlNode.tag, klass: wlxmlNode.klass});
-        this.$element.replaceWith(wrapper.dom());
+        this.dom().replaceWith(wrapper.dom());
         wrapper.append(this);
         return wrapper;
     },
 
-    childIndex: function(child) {
-        var children = this.children(),
-            toret = null;
-        children.forEach(function(c, idx) {
-            if(c.sameNode(child)) {
-                toret = idx;
-                return false;
-            }
-        });
-        return toret;
-    },
-
     detach: function() {
-        this.$element.detach();
+        this.dom().detach();
         this.canvas = null;
     }
 });
@@ -90,7 +61,7 @@ var manipulate = function(e, params, action) {
     } else {
         dom = DocumentNodeElement.createDOM(params);
     }
-    e.$element[action](dom);
+    e.dom()[action](dom);
     return documentElementFromHTMLElement(dom);
 };
 
@@ -105,26 +76,57 @@ $.extend(DocumentNodeElement.prototype, {
     after: function(params) {
         manipulate(this, params, 'after');
     },
+    children: function() {
+        var toret = [];
+        if(this instanceof DocumentTextElement)
+            return toret;
+
+
+        var elementContent = this.dom().contents();
+        var element = this;
+        elementContent.each(function(idx) {
+            var childElement = documentElementFromHTMLElement(this, element.canvas);
+            if(idx === 0 && elementContent.length > 1 && elementContent[1].nodeType === Node.ELEMENT_NODE && (childElement instanceof DocumentTextElement) && $.trim($(this).text()) === '')
+                return true;
+            if(idx > 0 && childElement instanceof DocumentTextElement) {
+                if(toret[toret.length-1] instanceof DocumentNodeElement && $.trim($(this).text()) === '')
+                    return true;
+            }
+            toret.push(childElement);
+        });
+        return toret;
+    },
+    childIndex: function(child) {
+        var children = this.children(),
+            toret = null;
+        children.forEach(function(c, idx) {
+            if(c.sameNode(child)) {
+                toret = idx;
+                return false;
+            }
+        });
+        return toret;
+    },
     getWlxmlTag: function() {
-        return this.$element.attr('wlxml-tag');
+        return this.dom().attr('wlxml-tag');
     },
     setWlxmlTag: function(tag) {
-        this.$element.attr('wlxml-tag', tag);
+        this.dom().attr('wlxml-tag', tag);
     },
     getWlxmlClass: function() {
-        var klass = this.$element.attr('wlxml-class');
+        var klass = this.dom().attr('wlxml-class');
         if(klass)
             return klass.replace('-', '.');
         return undefined;
     },
     setWlxmlClass: function(klass) {
         if(klass)
-            this.$element.attr('wlxml-class', klass);
+            this.dom().attr('wlxml-class', klass);
         else
-            this.$element.removeAttr('wlxml-class');
+            this.dom().removeAttr('wlxml-class');
     },
     is: function(what) {
-        if(what === 'list' && _.contains(['list-items', 'list-items-enum'], this.$element.attr('wlxml-class')))
+        if(what === 'list' && _.contains(['list-items', 'list-items-enum'], this.dom().attr('wlxml-class')))
             return true;
         return false;
     }
@@ -150,10 +152,10 @@ DocumentNodeElement.create = function(params, canvas) {
 
 $.extend(DocumentTextElement.prototype, {
     setText: function(text) {
-        this.$element[0].data = text;
+        this.dom()[0].data = text;
     },
     getText: function() {
-        return this.$element.text();
+        return this.dom().text();
     },
     after: function(params) {
         if(params instanceof DocumentTextElement || params.text)
@@ -164,9 +166,9 @@ $.extend(DocumentTextElement.prototype, {
         } else {
             dom = DocumentNodeElement.createDOM(params);
         }
-        this.$element.wrap('<div>');
-        this.$element.parent().after(dom[0]);
-        this.$element.unwrap();
+        this.dom().wrap('<div>');
+        this.dom().parent().after(dom[0]);
+        this.dom().unwrap();
         return documentElementFromHTMLElement(dom[0]);
     },
     before: function(params) {
@@ -178,9 +180,9 @@ $.extend(DocumentTextElement.prototype, {
         } else {
             dom = DocumentNodeElement.createDOM(params);
         }
-        this.$element.wrap('<div>');
-        this.$element.parent().before(dom[0]);
-        this.$element.unwrap();
+        this.dom().wrap('<div>');
+        this.dom().parent().before(dom[0]);
+        this.dom().unwrap();
         return documentElementFromHTMLElement(dom[0]);
     },
     wrapWithNodeElement: function(wlxmlNode) {
@@ -197,9 +199,26 @@ $.extend(DocumentTextElement.prototype, {
         }
     },
     unwrap: function() {
-        if(this.parent().children().length === 1) {
-            var parent = this.parent();
-            parent.after(this);
+        var parent = this.parent();
+        if(parent.children().length === 1) {
+            var grandParent = parent.parent();
+            if(grandParent) {
+                var grandParentChildren = grandParent.children(),
+                    idx = grandParent.childIndex(parent),
+                    prev = idx - 1 > -1 ? grandParentChildren[idx-1] : null,
+                    next = idx + 1 < grandParentChildren.length ? grandParentChildren[idx+1] : null;
+                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());
+                } else {
+                    parent.after(this);
+                }
+            } else {
+                parent.after(this);
+            }
             parent.detach();
         }
     },