X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/6f88a272f930c30868c43b724368b4bcf6f0a3a7..02ea7eed98a6826504c4472a9309010277026a03:/src/smartxml/smartxml.js diff --git a/src/smartxml/smartxml.js b/src/smartxml/smartxml.js index d8b6bf0..b469068 100644 --- a/src/smartxml/smartxml.js +++ b/src/smartxml/smartxml.js @@ -26,7 +26,10 @@ $.extend(DocumentNode.prototype, { this._$ = $(nativeNode); }, - detach: function() { this._$.detach(); }, + detach: function() { + this._$.detach(); + return this; + }, sameNode: function(otherNode) { return otherNode && this.nativeNode === otherNode.nativeNode; @@ -37,15 +40,17 @@ $.extend(DocumentNode.prototype, { }, after: function(node) { - node = node instanceof ElementNode ? node : this.document.createElementNode(node); - this._$.after(node.nativeNode); - return node; + var insertion = this.getNodeInsertion(node); + this._$.after(insertion.ofNode.nativeNode); + this.triggerChangeEvent(insertion.insertsNew ? 'nodeAdded' : 'nodeMoved', {node: insertion.ofNode}); + return insertion.ofNode; }, before: function(node) { - node = node instanceof ElementNode ? node : this.document.createElementNode(node); - this._$.before(node.nativeNode); - return node; + var insertion = this.getNodeInsertion(node); + this._$.before(insertion.ofNode.nativeNode); + this.triggerChangeEvent(insertion.insertsNew ? 'nodeAdded' : 'nodeMoved', {node: insertion.ofNode}); + return insertion.ofNode; }, wrapWith: function(node) { @@ -62,6 +67,18 @@ $.extend(DocumentNode.prototype, { var event = new events.ChangeEvent(type, $.extend({node: this}, metaData || {})); this.document.trigger('change', event); }, + + getNodeInsertion: function(node) { + var insertion = {}; + if(node instanceof DocumentNode) { + insertion.ofNode = node; + insertion.insertsNew = !this.document.containsNode(node); + } else { + insertion.ofNode = this.document.createElementNode(node); + insertion.insertsNew = true; + } + return insertion; + } }); var ElementNode = function(nativeNode, document) { @@ -150,8 +167,17 @@ $.extend(ElementNode.prototype, { }, append: function(node) { - node = node instanceof DocumentNode ? node : this.document.createElementNode(node); - this._$.append(node.nativeNode); + var insertion = this.getNodeInsertion(node); + this._$.append(insertion.ofNode.nativeNode); + this.triggerChangeEvent(insertion.insertsNew ? 'nodeAdded' : 'nodeMoved', {node: insertion.ofNode}); + return insertion.ofNode; + }, + + 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; }, unwrapContent: function() { @@ -200,6 +226,10 @@ $.extend(ElementNode.prototype, { }; }, + wrapText: function(params) { + return this.document._wrapText(_.extend({inside: this}, params)); + }, + toXML: function() { var wrapper = $('