X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/70b1b491ce0fcdf036c97e381b8fc6867e06b3c2..412e60ded1457ec0f408e2234c9dd60122929bac:/modules/documentCanvas/canvas/documentElement.js

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index 4d74722..0627bc1 100644
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -1,6 +1,6 @@
 define([
-'libs/jquery-1.9.1.min',
-'libs/underscore-min',
+'libs/jquery',
+'libs/underscore',
 'modules/documentCanvas/classAttributes',
 'modules/documentCanvas/canvas/utils',
 'modules/documentCanvas/canvas/widgets',
@@ -47,7 +47,7 @@ $.extend(DocumentElement.prototype, {
         this.$element = $(htmlElement);
     },
     bound: function() {
-        return this.canvas !== undefined;
+        return $.contains(document.documentElement, this.dom()[0]);
     },
     dom: function() {
         return this.$element;
@@ -74,7 +74,7 @@ $.extend(DocumentElement.prototype, {
     },
 
     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;
@@ -101,8 +101,34 @@ $.extend(DocumentElement.prototype, {
         return toret;
     },
 
+    getPreviousTextElement: function(includeInvisible) {
+        return this.getNearestTextElement('above', includeInvisible);
+    },
+
+    getNextTextElement: function(includeInvisible) {
+        return this.getNearestTextElement('below', includeInvisible);
+    },
+
+    getNearestTextElement: function(direction, includeInvisible) {
+        includeInvisible = includeInvisible !== undefined ? includeInvisible : false;
+        var selector = '[document-text-element]' + (includeInvisible ? '' : ':visible');
+        return this.canvas.getDocumentElement(utils.nearestInDocumentOrder(selector, direction, this.dom()[0]));
+    },
+
     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));
     }
 });
 
@@ -136,8 +162,10 @@ $.extend(DocumentNodeElement, {
         }
         element.data('other-attrs', params.others);
 
-        if(params.rawChildren) {
+        if(params.rawChildren && params.rawChildren.length) {
             container.append(params.rawChildren);
+        } else if(params.prepopulateOnEmpty) {
+            element.append(DocumentTextElement.create({text: ''}));
         }
         return dom;
     },
@@ -188,6 +216,49 @@ $.extend(DocumentNodeElement.prototype, {
         this.canvas = null;
         return this;
     },
+    unwrapContents: function() {
+        var parent = this.parent();
+        if(!parent)
+            return;
+
+        var parentChildren = parent.children(),
+            myChildren = this.children(),
+            myIdx = parent.childIndex(this);
+
+        if(myChildren.length === 0)
+            return this.detach();
+
+        var moveLeftRange, moveRightRange, leftMerged;
+
+        if(myIdx > 0 && (parentChildren[myIdx-1] instanceof DocumentTextElement) && (myChildren[0] instanceof DocumentTextElement)) {
+            parentChildren[myIdx-1].appendText(myChildren[0].getText());
+            myChildren[0].detach();
+            moveLeftRange = true;
+            leftMerged = true;
+        } else {
+            leftMerged = false;
+        }
+
+        if(!(leftMerged && myChildren.length === 1)) {
+            if(myIdx < parentChildren.length - 1 && (parentChildren[myIdx+1] instanceof DocumentTextElement) && (myChildren[myChildren.length-1] instanceof DocumentTextElement)) {
+                parentChildren[myIdx+1].prependText(myChildren[myChildren.length-1].getText());
+                myChildren[myChildren.length-1].detach();
+                moveRightRange = true;
+            }
+        }
+
+        var childrenLength = this.children().length;
+        this.children().forEach(function(child) {
+            this.before(child);
+        }.bind(this));
+
+        this.detach();
+
+        return {
+            element1: parent.children()[myIdx + (moveLeftRange ? -1 : 0)],
+            element2: parent.children()[myIdx + childrenLength-1 + (moveRightRange ? 1 : 0)]
+        };
+    },
     data: function() {
         var dom = this.dom(),
             args = Array.prototype.slice.call(arguments, 0);
@@ -449,6 +520,9 @@ $.extend(DocumentTextElement.prototype, {
     appendText: function(text) {
         this.dom().contents()[0].data += text;
     },
+    prependText: function(text) {
+        this.dom().contents()[0].data = text + this.dom().contents()[0].data;
+    },
     getText: function() {
         return this.dom().text().replace(utils.unicode.ZWS, '');
     },
@@ -516,8 +590,9 @@ $.extend(DocumentTextElement.prototype, {
                     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);
                 }