editor: cleanup

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

diff --git a/src/smartxml/smartxml.js b/src/smartxml/smartxml.js
index f92bf01..d168e6d 100644 (file)
--- a/src/smartxml/smartxml.js
+++ b/src/smartxml/smartxml.js
@@ -33,7 +33,20 @@ $.extend(DocumentNode.prototype, {
     },
 
     clone: function() {
     },
 
     clone: function() {

-        var clone = this._$.clone(true, true);
+        var clone = this._$.clone(true, true),
+            node = this;
+        clone.find('*').addBack().each(function() {
+            var el = this,
+                clonedData = $(this).data();
+
+            _.pairs(clonedData).forEach(function(pair) {
+                var key = pair[0],
+                    value = pair[1];
+                if(_.isFunction(value.clone)) {
+                    clonedData[key] = value.clone(node.document.createDocumentNode(el));
+                }
+            });
+        });

         return this.document.createDocumentNode(clone[0]);
     },
 
         return this.document.createDocumentNode(clone[0]);
     },
 


@@ -222,7 +235,12 @@ $.extend(TextNode.prototype, {
 
 
 var parseXML = function(xml) {
 
 
 var parseXML = function(xml) {

-    return $($.trim(xml))[0];
+    var toret = $($.trim(xml));
+    if(!toret.length) {
+        throw new Error('Unable to parse XML: ' + xml);
+    }
+    return toret[0];
+

 };
 
 var registerTransformation = function(desc, name, target) {
 };
 
 var registerTransformation = function(desc, name, target) {


@@ -245,8 +263,7 @@ var registerMethod = function(methodName, method, target) {
 };
 
 
 };
 
 

-var Document = function(xml) {
-    this.loadXML(xml);
+var Document = function(xml, extensions) {

     this.undoStack = [];
     this.redoStack = [];
     this._transactionStack = [];
     this.undoStack = [];
     this.redoStack = [];
     this._transactionStack = [];


@@ -260,6 +277,11 @@ var Document = function(xml) {
     this._elementNodeTransformations = {};
     
     this.registerExtension(coreTransformations);
     this._elementNodeTransformations = {};
     
     this.registerExtension(coreTransformations);

+
+    (extensions || []).forEach(function(extension) {
+        this.registerExtension(extension);
+    }.bind(this));
+    this.loadXML(xml);

 };
 
 $.extend(Document.prototype, Backbone.Events, {
 };
 
 $.extend(Document.prototype, Backbone.Events, {


@@ -276,6 +298,9 @@ $.extend(Document.prototype, Backbone.Events, {
                     /* globals document */
                     from = document.createTextNode(from.text);
                 } else {
                     /* globals document */
                     from = document.createTextNode(from.text);
                 } else {

+                    if(!from.tagName) {
+                        throw new Error('tagName missing');
+                    }

                     var node = $('<' + from.tagName + '>');
 
                     _.keys(from.attrs || {}).forEach(function(key) {
                     var node = $('<' + from.tagName + '>');
 
                     _.keys(from.attrs || {}).forEach(function(key) {