small fix for lists

[fnpeditor.git] / src / smartxml / core.js

diff --git a/src/smartxml/core.js b/src/smartxml/core.js
index 44be8d6..7326507 100644 (file)
--- a/src/smartxml/core.js
+++ b/src/smartxml/core.js
@@ -13,12 +13,21 @@ var INSERTION = function(implementation) {
             nodeParent,
             returned;
         options = options || {};
             nodeParent,
             returned;
         options = options || {};

-        if(!(this.document.containsNode(this))) {
+        if(!(this.document.containsNode(this)) || !insertion.insertsNew) {

             nodeParent = insertion.ofNode.parent();
         }
             nodeParent = insertion.ofNode.parent();
         }

+        if(!insertion.insertsNew && insertion.ofNode.isSurroundedByTextNodes()) {
+            var prev = insertion.ofNode.prev(),
+                next = insertion.ofNode.next();
+            prev.setText(prev.getText()+next.getText());
+            next.detach();
+        }

         returned = implementation.call(this, insertion.ofNode);
         returned = implementation.call(this, insertion.ofNode);

-        if(!options.silent && returned.sameNode(insertion.ofNode)) {
-            this.triggerChangeEvent(insertion.insertsNew ? 'nodeAdded' : 'nodeMoved', {node: insertion.ofNode}, nodeParent, nodeWasContained);
+        if(!options.silent && returned && returned.sameNode(insertion.ofNode)) {
+            if(!insertion.insertsNew) {
+                this.triggerChangeEvent('nodeDetached', {node: insertion.ofNode, parent: nodeParent, move: true});
+            }
+            this.triggerChangeEvent('nodeAdded', {node: insertion.ofNode, move: !insertion.insertsNew}, nodeParent, nodeWasContained);

         }
         return returned;
     };
         }
         return returned;
     };


@@ -32,6 +41,10 @@ var documentNodeTransformations = {
         this._$.detach();
         if(existed) {
             this.triggerChangeEvent('nodeDetached', {parent: parent});
         this._$.detach();
         if(existed) {
             this.triggerChangeEvent('nodeDetached', {parent: parent});

+            if(!parent) {
+                // This was the root of the document
+                this.document._defineDocumentProperties(null);
+            }

         }
         return this;
     },
         }
         return this;
     },


@@ -41,13 +54,20 @@ var documentNodeTransformations = {
         if(this.isRoot()) {
             return this.document.replaceRoot(node);
         }
         if(this.isRoot()) {
             return this.document.replaceRoot(node);
         }

-        toret = this.after(node);
-        this.detach();
-        return toret;
+        if(this.parent()) {
+            toret = this.after(node);
+            this.detach();
+            return toret;
+        }
+        throw new Error('Cannot replace node without a parent.');

     },
 
     after: INSERTION(function(node) {
     },
 
     after: INSERTION(function(node) {

+        if(this.isRoot()) {
+            return;
+        }

         var next = this.next();
         var next = this.next();

+

         if(next && next.nodeType === Node.TEXT_NODE && node.nodeType === Node.TEXT_NODE) {
             next.setText(node.getText() + next.getText());
             node.detach();
         if(next && next.nodeType === Node.TEXT_NODE && node.nodeType === Node.TEXT_NODE) {
             next.setText(node.getText() + next.getText());
             node.detach();


@@ -58,6 +78,9 @@ var documentNodeTransformations = {
     }),
 
     before: INSERTION(function(node) {
     }),
 
     before: INSERTION(function(node) {

+        if(this.isRoot()) {
+            return;
+        }

         var prev = this.prev();
         if(prev && prev.nodeType === Node.TEXT_NODE && node.nodeType === Node.TEXT_NODE) {
             prev.setText(prev.getText() + node.getText());
         var prev = this.prev();
         if(prev && prev.nodeType === Node.TEXT_NODE && node.nodeType === Node.TEXT_NODE) {
             prev.setText(prev.getText() + node.getText());


@@ -70,8 +93,9 @@ var documentNodeTransformations = {
 
     wrapWith: function(node) {
         var insertion = this.getNodeInsertion(node);
 
     wrapWith: function(node) {
         var insertion = this.getNodeInsertion(node);

-        if(this.parent()) {
-            this.before(insertion.ofNode);
+
+        if(this.parent() || this.isRoot()) {
+            this.replaceWith(insertion.ofNode);

         }
         insertion.ofNode.append(this);
         return insertion.ofNode;
         }
         insertion.ofNode.append(this);
         return insertion.ofNode;


@@ -96,41 +120,60 @@ var documentNodeTransformations = {
 
 var elementNodeTransformations = {
 
 
 var elementNodeTransformations = {
 

-    detach: function() {
-        var next;
-        if(this.parent() && this.isSurroundedByTextElements()) {
-            next = this.next();
-            this.prev().appendText(next.getText());
-            next.detach();
+    detach: function(params) {
+        var next, prev;
+
+        params = params || {};
+
+        if(!params.normalizeStrategy) {
+            params.normalizeStrategy = 'merge';
+        }
+
+        if(this.parent() && this.isSurroundedByTextNodes()) {
+            if(params.normalizeStrategy === 'detach-left') {
+                this.prev().detach();
+            } else if(params.normalizeStrategy === 'detach-right') {
+                this.next().detach();
+            } else if(params.normalizeStrategy === 'merge') {
+                next = this.next();
+                prev = this.prev();
+                params.ret = {
+                    mergedTo: prev,
+                    previousLen: prev.getText().length
+                };
+                prev.appendText(next.getText());
+                next.detach();
+            } else {
+                throw new Error('unknown normalize strategy for detach');
+            }

         }
         return this.__super__.detach();
     },
 
     setTag: function(tagName) {
         }
         return this.__super__.detach();
     },
 
     setTag: function(tagName) {

-        var node = this.document.createDocumentNode({tagName: tagName}),
-            oldTagName = this.getTagName(),
-            myContents = this._$.contents();
+        var node = this.document.createDocumentNode({tagName: tagName});

 
         this.getAttrs().forEach(function(attribute) {
 
         this.getAttrs().forEach(function(attribute) {

-            node.setAttr(attribute.name, attribute.value, true);
+            node.setAttr(attribute.name, attribute.value);

         });
         });

-        node.setData(this.getData());

 
 

-        if(this.sameNode(this.document.root)) {
-            this.document._defineDocumentProperties(node._$);
-        }
+        this.contents().forEach(function(child) {
+            node.append(child);
+        });

 
 

-        /* TODO: This invalidates old references to this node. Caching instances on nodes would fix this. */
-        this._$.replaceWith(node._$);
-        this._setNativeNode(node._$[0]);
-        this._$.append(myContents);
-        this.triggerChangeEvent('nodeTagChange', {oldTagName: oldTagName, newTagName: this.getTagName()});
-    },
+        node.setData(this.getData());

 
 

+        this.replaceWith(node);
+        return node;
+    },

 
     setAttr: function(name, value, silent) {
         var oldVal = this.getAttr(name);
 
     setAttr: function(name, value, silent) {
         var oldVal = this.getAttr(name);

-        this._$.attr(name, value);
+        if(_.isUndefined(value)) {
+            this._$.removeAttr(name);
+        } else {
+            this._$.attr(name, value);
+        }

         if(!silent) {
             this.triggerChangeEvent('nodeAttrChange', {attr: name, oldVal: oldVal, newVal: value});
         }
         if(!silent) {
             this.triggerChangeEvent('nodeAttrChange', {attr: name, oldVal: oldVal, newVal: value});
         }


@@ -175,15 +218,21 @@ var elementNodeTransformations = {
             return;
         }
 
             return;
         }
 

+        this.contents()
+            .filter(function(child) {
+                return child.getProperty('describesParent');
+            }.bind(this))
+            .forEach(function(child) {
+                child.detach();
+            });
+

         var myContents = this.contents(),
             myIdx = parent.indexOf(this);
 
         var myContents = this.contents(),
             myIdx = parent.indexOf(this);
 

-

         if(myContents.length === 0) {
             return this.detach();
         }
 
         if(myContents.length === 0) {
             return this.detach();
         }
 

-

         var childrenLength = this.contents().length,
             first = true,
             shiftRange = false;
         var childrenLength = this.contents().length,
             first = true,
             shiftRange = false;


@@ -307,14 +356,14 @@ var textNodeTransformations = {
         var newElement = this.document.createDocumentNode({tagName: parentElement.getTagName(), attrs: attrs});
         parentElement.after(newElement);
 
         var newElement = this.document.createDocumentNode({tagName: parentElement.getTagName(), attrs: attrs});
         parentElement.after(newElement);
 

+        succeedingChildren.reverse().forEach(function(child) {
+            newElement.prepend(child);
+        });

         if(suffix.length > 0) {
         if(suffix.length > 0) {

-            newElement.append({text: suffix});
+            newElement.prepend({text: suffix});

         }
         }

-        succeedingChildren.forEach(function(child) {
-            newElement.append(child);
-        });

 
 

-        return {first: parentElement, second: newElement};
+        return {first: parentElement, second: newElement, created: newElement};

     },
 
     divideWithElementNode: function(node, params) {
     },
 
     divideWithElementNode: function(node, params) {


@@ -369,7 +418,9 @@ var documentTransformations = {
         }
 
         for(var i = idx1; i <= idx2; i++) {
         }
 
         for(var i = idx1; i <= idx2; i++) {

-            wrapper.append(parentContents[i].detach());
+            if(!parentContents[i].getProperty('describesParent')) {
+                wrapper.append(parentContents[i].detach());
+            }

         }
 
         insertingTarget[insertingMethod](wrapper);
         }
 
         insertingTarget[insertingMethod](wrapper);


@@ -414,7 +465,9 @@ var documentTransformations = {
                 wrapperElement.append({text: prefixInside});
             }
             for(var i = idx1 + 1; i < idx2; i++) {
                 wrapperElement.append({text: prefixInside});
             }
             for(var i = idx1 + 1; i < idx2; i++) {

-                wrapperElement.append(contentsInside[i]);
+                if(!contentsInside[i].getProperty('describesParent')) {
+                    wrapperElement.append(contentsInside[i]);
+                }

             }
             if(suffixInside.length > 0) {
                 wrapperElement.append({text: suffixInside});
             }
             if(suffixInside.length > 0) {
                 wrapperElement.append({text: suffixInside});


@@ -433,7 +486,7 @@ var documentTransformations = {
         return insertion.ofNode;
     },
     deleteText: function(params) {
         return insertion.ofNode;
     },
     deleteText: function(params) {

-        var ptr, prev, next, toDetach, middle, text;
+        var ptr, next, nextNext, toDetach, middle, text;

 
         if(params.from.node.sameNode(params.to.node)) {
             ptr = params.from.node;
 
         if(params.from.node.sameNode(params.to.node)) {
             ptr = params.from.node;


@@ -442,18 +495,30 @@ var documentTransformations = {
             return;
         }
 
             return;
         }
 

+        // Both edge text nodes need to be edited before anything else happen in case that
+        // they get merged when detaching content between them.
+        params.from.node.setText(params.from.node.getText().substr(0, params.from.offset));
+        params.to.node.setText(params.to.node.getText().substr(params.to.offset));
+

         ptr = params.from.node;
         ptr = params.from.node;

-        ptr.setText(ptr.getText().substr(0, params.from.offset));

         next = ptr.next();
         next = ptr.next();

+

         while(next || ptr.parent()) {
             if(next) {
         while(next || ptr.parent()) {
             if(next) {

-                if(next.sameNode(params.to.node) || (next.nodeType === Node.ELEMENT_NODE && next.containsNode(params.to.node))) {
+                if(next.sameNode(params.to.node)) {
+                    return;
+                }
+                else if(next.nodeType === Node.ELEMENT_NODE && next.containsNode(params.to.node)) {

                     middle = next;
                     break;
                 } else {
                     toDetach = next;
                     next = next.next();
                     middle = next;
                     break;
                 } else {
                     toDetach = next;
                     next = next.next();

-                    toDetach.detach();
+                    nextNext = next ? next.next() : null;
+                    toDetach.detach({normalizeStrategy: (next && next.sameNode(params.to.node)) ? 'merge' : 'detach-right'});
+                    if(next && !next.isInDocument()) {
+                        next = nextNext;
+                    }

                 }
             } else {
                 ptr = ptr.parent();
                 }
             } else {
                 ptr = ptr.parent();


@@ -461,20 +526,19 @@ var documentTransformations = {
             }
         }
 
             }
         }
 

-        ptr = params.to.node;
-        ptr.setText(ptr.getText().substr(params.to.offset));
-        prev = ptr.prev();
-        while(prev || ptr.parent()) {
-            if(ptr.sameNode(middle)) {
-                break;
-            }
-            if(prev) {
-                toDetach = prev;
-                prev = prev.prev();
-                toDetach.detach();
+        if(!this.containsNode(params.to.node)) {
+            // The end node was merged during detaching nodes above - there is nothing more left to do.
+            return;
+        }
+
+        ptr = middle.contents()[0];
+        while(ptr && !ptr.sameNode(params.to.node)) {
+            if(ptr.nodeType === Node.ELEMENT_NODE && ptr.containsNode(params.to.node)) {
+                ptr = ptr.contents()[0];
+                continue;

             } else {
             } else {

-                ptr = ptr.parent();
-                prev = ptr.prev();
+                ptr = ptr.next();
+                ptr.prev().detach();

             }
         }
     }
             }
         }
     }