X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/9a93c89991001d4ed088bee3b20cea374aa91d37..58425daa1aa7e717e92eaec170262de31ed47bc0:/src/smartxml/smartxml.js diff --git a/src/smartxml/smartxml.js b/src/smartxml/smartxml.js index 6e00a7d..2e507db 100644 --- a/src/smartxml/smartxml.js +++ b/src/smartxml/smartxml.js @@ -29,7 +29,7 @@ $.extend(DocumentNode.prototype, { detach: function() { this._$.detach(); }, sameNode: function(otherNode) { - return this.nativeNode === otherNode.nativeNode; + return otherNode && this.nativeNode === otherNode.nativeNode; }, parent: function() { @@ -41,10 +41,13 @@ $.extend(DocumentNode.prototype, { }, wrapWith: function(node) { + node = node instanceof ElementNode ? node : this.document.createElementNode(node); + if(this.parent()) { this.before(node); } node.append(this); + return node; }, triggerChangeEvent: function(type, metaData) { @@ -245,7 +248,7 @@ $.extend(Document.prototype, Backbone.Events, { createElementNode: function(from) { if(!(from instanceof HTMLElement)) { - from = $('<' + from.tagName + '>'); + from = $('<' + from.tagName + '>')[0]; } return new this.ElementNodeFactory(from, this); },