smartxml: normalizing document in loadXML instead of constructor

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

diff --git a/src/smartxml/smartxml.js b/src/smartxml/smartxml.js
index cb90e74..f4aa9fe 100644 (file)
--- a/src/smartxml/smartxml.js
+++ b/src/smartxml/smartxml.js
@@ -100,14 +100,20 @@ $.extend(ElementNode.prototype, DocumentNode.prototype, {
 
     setTag: function(tagName) {
         var node = this.document.createElementNode({tagName: tagName}),
 
     setTag: function(tagName) {
         var node = this.document.createElementNode({tagName: tagName}),

-            oldTagName = this.getTagName();
+            oldTagName = this.getTagName(),
+            myContents = this._$.contents();

 
         this.getAttrs().forEach(function(attribute) {
             node.setAttr(attribute.name, attribute.value, true);
         });
         node.setData(this.getData());
 
 
         this.getAttrs().forEach(function(attribute) {
             node.setAttr(attribute.name, attribute.value, true);
         });
         node.setData(this.getData());
 

+        if(this.sameNode(this.document.root)) {
+            defineDocumentProperties(this.document, node._$);
+        }
+        this._$.replaceWith(node._$);

         this._setNativeNode(node._$[0]);
         this._setNativeNode(node._$[0]);

+        this._$.append(myContents);

         this.triggerChangeEvent('nodeTagChange', {oldTagName: oldTagName, newTagName: this.getTagName()});
     },
 
         this.triggerChangeEvent('nodeTagChange', {oldTagName: oldTagName, newTagName: this.getTagName()});
     },
 


@@ -183,8 +189,12 @@ $.extend(ElementNode.prototype, DocumentNode.prototype, {
 
     toXML: function() {
         var wrapper = $('<div>');
 
     toXML: function() {
         var wrapper = $('<div>');

-        wrapper.append(this._$);
+        wrapper.append(this._getXMLDOMToDump());

         return wrapper.html();
         return wrapper.html();

+    },
+    
+    _getXMLDOMToDump: function() {
+        return this._$;

     }
 });
 
     }
 });
 


@@ -214,16 +224,9 @@ var parseXML = function(xml) {
 };
 
 var Document = function(xml) {
 };
 
 var Document = function(xml) {

-    var $document = $(parseXML(xml));
-
-    var doc = this;
-    Object.defineProperty(this, 'root', {get: function() {
-        return doc.createElementNode($document[0]);
-    }});
-    Object.defineProperty(this, 'dom', {get: function() {
-        return $document[0];
-    }});
+    this.loadXML(xml);

 };
 };

+

 $.extend(Document.prototype, Backbone.Events, {
     ElementNodeFactory: ElementNode,
     TextNodeFactory: TextNode,
 $.extend(Document.prototype, Backbone.Events, {
     ElementNodeFactory: ElementNode,
     TextNodeFactory: TextNode,


@@ -239,11 +242,25 @@ $.extend(Document.prototype, Backbone.Events, {
         return new this.TextNodeFactory(nativeNode, this);
     },
 
         return new this.TextNodeFactory(nativeNode, this);
     },
 

+    loadXML: function(xml) {
+        defineDocumentProperties(this, $(parseXML(xml)));
+        
+        this.trigger('contentSet');
+    },
+

     toXML: function() {
         return this.root.toXML();
     }
 });
 
     toXML: function() {
         return this.root.toXML();
     }
 });
 

+var defineDocumentProperties = function(doc, $document) {
+    Object.defineProperty(doc, 'root', {get: function() {
+        return doc.createElementNode($document[0]);
+    }, configurable: true});
+    Object.defineProperty(doc, 'dom', {get: function() {
+        return $document[0];
+    }, configurable: true});
+};

 
 return {
     documentFromXML: function(xml) {
 
 return {
     documentFromXML: function(xml) {