wip: extracting core transformations continued - detfineDocumentProperties from core

diff --git a/src/smartxml/core.js b/src/smartxml/core.js
index b5f8c44..bab584e 100644 (file)
--- a/src/smartxml/core.js
+++ b/src/smartxml/core.js
@@ -95,7 +95,7 @@ var elementNodeTransformations = {
         node.setData(this.getData());
 
         if(this.sameNode(this.document.root)) {
         node.setData(this.getData());
 
         if(this.sameNode(this.document.root)) {

-            defineDocumentProperties(this.document, node._$);
+            this.document._defineDocumentProperties(node._$);

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

diff --git a/src/smartxml/smartxml.js b/src/smartxml/smartxml.js
index d74ec13..2ed9c47 100644 (file)
--- a/src/smartxml/smartxml.js
+++ b/src/smartxml/smartxml.js
@@ -305,7 +305,7 @@ $.extend(Document.prototype, Backbone.Events, {
 
     loadXML: function(xml, options) {
         options = options || {};
 
     loadXML: function(xml, options) {
         options = options || {};

-        defineDocumentProperties(this, $(parseXML(xml)));
+        this._defineDocumentProperties($(parseXML(xml)));

         if(!options.silent) {
             this.trigger('contentSet');
         }
         if(!options.silent) {
             this.trigger('contentSet');
         }


@@ -452,18 +452,19 @@ $.extend(Document.prototype, Backbone.Events, {
             toret = toret.contents()[idx];
         });
         return toret;
             toret = toret.contents()[idx];
         });
         return toret;

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

     }
 });
 
     }
 });
 

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

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