smartxml: handling undefined value sent to DocumentNode.sameNode

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

diff --git a/src/smartxml/smartxml.js b/src/smartxml/smartxml.js
index b90a042..7c68e06 100644 (file)
--- 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() {
@@ -189,8 +189,12 @@ $.extend(ElementNode.prototype, DocumentNode.prototype, {
 
     toXML: function() {
         var wrapper = $('<div>');
-        wrapper.append(this._$);
+        wrapper.append(this._getXMLDOMToDump());
         return wrapper.html();
+    },
+    
+    _getXMLDOMToDump: function() {
+        return this._$;
     }
 });
 
@@ -205,12 +209,24 @@ $.extend(TextNode.prototype, DocumentNode.prototype, {
         return this.nativeNode.data;
     },
 
+    setText: function(text) {
+        this.nativeNode.data = text;
+        this.triggerTextChangeEvent();
+    },
+
     appendText: function(text) {
         this.nativeNode.data = this.nativeNode.data + text;
+        this.triggerTextChangeEvent();
     },
 
     prependText: function(text) {
         this.nativeNode.data = text + this.nativeNode.data;
+        this.triggerTextChangeEvent();
+    },
+
+    triggerTextChangeEvent: function() {
+        var event = new events.ChangeEvent('nodeTextChange', {node: this});
+        this.document.trigger('change', event);
     }
 });
 
@@ -238,10 +254,12 @@ $.extend(Document.prototype, Backbone.Events, {
         return new this.TextNodeFactory(nativeNode, this);
     },
 
-    loadXML: function(xml) {
+    loadXML: function(xml, options) {
+        options = options || {};
         defineDocumentProperties(this, $(parseXML(xml)));
-        
-        this.trigger('contentSet');
+        if(!options.silent) {
+            this.trigger('contentSet');
+        }
     },
 
     toXML: function() {