X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/b5b63aaa73c53f6ba8091c8e8662ff478a1ecca7..03a3f51f2a8fd57f90b09a14001e91a4295b5278:/src/smartxml/smartxml.js

diff --git a/src/smartxml/smartxml.js b/src/smartxml/smartxml.js
index b4036d3..6e754de 100644
--- a/src/smartxml/smartxml.js
+++ b/src/smartxml/smartxml.js
@@ -11,6 +11,16 @@ define([
 var TEXT_NODE = Node.TEXT_NODE;
 
 
+var INSERTION = function(implementation) {
+    var toret = function(node) {
+        var insertion = this.getNodeInsertion(node);
+        implementation.call(this, insertion.ofNode.nativeNode);
+        this.triggerChangeEvent(insertion.insertsNew ? 'nodeAdded' : 'nodeMoved', {node: insertion.ofNode});
+        return insertion.ofNode;
+    };
+    return toret;
+};
+
 var DocumentNode = function(nativeNode, document) {
     if(!document) {
         throw new Error('undefined document for a node');
@@ -27,7 +37,9 @@ $.extend(DocumentNode.prototype, {
     },
 
     detach: function() {
+        var parent = this.parent();
         this._$.detach();
+        this.triggerChangeEvent('nodeDetached', {parent: parent});
         return this;
     },
 
@@ -36,22 +48,29 @@ $.extend(DocumentNode.prototype, {
     },
 
     parent: function() {
-        return this.nativeNode.parentNode ? this.document.createElementNode(this.nativeNode.parentNode) : null;
+        var parentNode = this.nativeNode.parentNode;
+        if(parentNode && parentNode.nodeType === Node.ELEMENT_NODE) {
+            return this.document.createElementNode(parentNode);
+        }
+        return null;
     },
 
-    after: function(node) {
-        var insertion = this.getNodeInsertion(node);
-        this._$.after(insertion.ofNode.nativeNode);
-        this.triggerChangeEvent(insertion.insertsNew ? 'nodeAdded' : 'nodeMoved', {node: insertion.ofNode});
-        return insertion.ofNode;
+    parents: function() {
+        var parent = this.parent(),
+            parents = parent ? parent.parents() : [];
+        if(parent) {
+            parents.unshift(parent);
+        }
+        return parents;
     },
 
-    before: function(node) {
-        var insertion = this.getNodeInsertion(node);
-        this._$.before(insertion.ofNode.nativeNode);
-        this.triggerChangeEvent(insertion.insertsNew ? 'nodeAdded' : 'nodeMoved', {node: insertion.ofNode});
-        return insertion.ofNode;
-    },
+    after: INSERTION(function(nativeNode) {
+        return this._$.after(nativeNode);
+    }),
+
+    before: INSERTION(function(nativeNode) {
+        return this._$.before(nativeNode);
+    }),
 
     wrapWith: function(node) {
         node = node instanceof ElementNode ? node : this.document.createElementNode(node);
@@ -170,19 +189,13 @@ $.extend(ElementNode.prototype, {
         return toret;
     },
 
-    append: function(node) {
-        var insertion = this.getNodeInsertion(node);
-        this._$.append(insertion.ofNode.nativeNode);
-        this.triggerChangeEvent(insertion.insertsNew ? 'nodeAdded' : 'nodeMoved', {node: insertion.ofNode});
-        return insertion.ofNode;
-    },
+    append: INSERTION(function(nativeNode) {
+        this._$.append(nativeNode);
+    }),
 
-    prepend: function(node) {
-        var insertion = this.getNodeInsertion(node);
-        this._$.prepend(insertion.ofNode.nativeNode);
-        this.triggerChangeEvent(insertion.insertsNew ? 'nodeAdded' : 'nodeMoved', {node: insertion.ofNode});
-        return insertion.ofNode;
-    },
+    prepend: INSERTION(function(nativeNode) {
+        this._$.prepend(nativeNode);
+    }),
 
     unwrapContent: function() {
         var parent = this.parent();
@@ -319,7 +332,13 @@ $.extend(Document.prototype, Backbone.Events, {
                 from = node[0];
             }
         }
-        return new this.ElementNodeFactory(from, this);
+        var Factory;
+        if(from.nodeType === Node.TEXT_NODE) {
+            Factory = this.TextNodeFactory;
+        } else if(from.nodeType === Node.ELEMENT_NODE) {
+            Factory = this.ElementNodeFactory;
+        }
+        return new Factory(from, this);
     },
 
     createTextNode: function(nativeNode) {
@@ -339,7 +358,7 @@ $.extend(Document.prototype, Backbone.Events, {
     },
 
     containsNode: function(node) {
-        return node._$.parents().index(this.root._$) !== -1;
+        return this.root && (node.nativeNode === this.root.nativeNode || node._$.parents().index(this.root._$) !== -1);
     },
 
     wrapNodes: function(params) {
@@ -378,6 +397,25 @@ $.extend(Document.prototype, Backbone.Events, {
         return wrapper;
     },
 
+    getSiblingParents: function(params) {
+        var parents1 = [params.node1].concat(params.node1.parents()).reverse(),
+            parents2 = [params.node2].concat(params.node2.parents()).reverse(),
+            noSiblingParents = null;
+
+        if(parents1.length === 0 || parents2.length === 0 || !(parents1[0].sameNode(parents2[0]))) {
+            return noSiblingParents;
+        }
+
+        var i;
+        for(i = 0; i < Math.min(parents1.length, parents2.length); i++) {
+            if(parents1[i].sameNode(parents2[i])) {
+                continue;
+            }
+            break;
+        }
+        return {node1: parents1[i], node2: parents2[i]};
+    },
+
     _wrapText: function(params) {
         params = _.extend({textNodeIdx: 0}, params);
         if(typeof params.textNodeIdx === 'number') {
@@ -426,6 +464,11 @@ $.extend(Document.prototype, Backbone.Events, {
             wrapperElement.after({text: suffixOutside});
         }
         return wrapperElement;
+    },
+
+    trigger: function() {
+        //console.log('trigger: ' + arguments[0] + (arguments[1] ? ', ' + arguments[1].type : ''));
+        Backbone.Events.trigger.apply(this, arguments);
     }
 });