fixing tests

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

diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js
index dbc0cf0..016f793 100644 (file)
--- a/src/wlxml/wlxml.js
+++ b/src/wlxml/wlxml.js
@@ -22,13 +22,13 @@ AttributesList.prototype.keys = function() {
 };
 
 var installObject = function(instance, klass) {
 };
 
 var installObject = function(instance, klass) {

-    var methods = classMethods[klass];
-    if(methods) {
-        instance.object = Object.create(methods);
-        _.keys(methods).forEach(function(key) {
-            instance.object[key] = _.bind(instance.object[key], instance);
-        });
-    }
+    var methods = instance.document.classMethods[klass] || {},
+        transformations = instance.document.classTransformations[klass] || {};
+
+    instance.object = Object.create(_.extend({}, methods, transformations));
+    _.keys(methods).concat(_.keys(transformations)).forEach(function(key) {
+        instance.object[key] = _.bind(instance.object[key], instance);
+    });

 }
 
 var WLXMLElementNode = function(nativeNode, document) {
 }
 
 var WLXMLElementNode = function(nativeNode, document) {


@@ -127,29 +127,37 @@ $.extend(WLXMLElementNode.prototype, smartxml.ElementNode.prototype, {
     }
 });
 
     }
 });
 

-WLXMLElementNode.prototype.transformations.register(transformations.createContextTransformation({
-    name: 'wlxml.setMetaAttribute',
-    impl: function(args) {
-        this.setMetaAttribute(args.name, args.value);
-    },
-    getChangeRoot: function() {
-        return this.context;
-    }
-}));
+// WLXMLElementNode.prototype.transformations.register(transformations.createContextTransformation({
+//     name: 'wlxml.setMetaAttribute',
+//     impl: function(args) {
+//         this.setMetaAttribute(args.name, args.value);
+//     },
+//     getChangeRoot: function() {
+//         return this.context;
+//     }
+// }));

 
 
 
 
 
 

+var WLXMLDocumentNode = function() {
+    smartxml.DocumentNode.apply(this, arguments);
+}
+WLXMLDocumentNode.prototype = Object.create(smartxml.DocumentNode.prototype);
+

 var WLXMLDocument = function(xml, options) {
     smartxml.Document.call(this, xml);
     this.options = options;
 var WLXMLDocument = function(xml, options) {
     smartxml.Document.call(this, xml);
     this.options = options;

+
+    this.classMethods = {};
+    this.classTransformations = {};

 };
 
 var formatter_prefix = '_wlxml_formatter_';
 
 };
 
 var formatter_prefix = '_wlxml_formatter_';
 

+

 WLXMLDocument.prototype = Object.create(smartxml.Document.prototype);
 $.extend(WLXMLDocument.prototype, {
     ElementNodeFactory: WLXMLElementNode,
 WLXMLDocument.prototype = Object.create(smartxml.Document.prototype);
 $.extend(WLXMLDocument.prototype, {
     ElementNodeFactory: WLXMLElementNode,

-

     loadXML: function(xml) {
         smartxml.Document.prototype.loadXML.call(this, xml, {silent: true});
         $(this.dom).find(':not(iframe)').addBack().contents()
     loadXML: function(xml) {
         smartxml.Document.prototype.loadXML.call(this, xml, {silent: true});
         $(this.dom).find(':not(iframe)').addBack().contents()


@@ -235,6 +243,43 @@ $.extend(WLXMLDocument.prototype, {
                 el.replaceWith(document.createTextNode(text.transformed));
             });
         this.trigger('contentSet');
                 el.replaceWith(document.createTextNode(text.transformed));
             });
         this.trigger('contentSet');

+    },
+
+    registerClassTransformation: function(Transformation, className) {
+        var thisClassTransformations = (this.classTransformations[className] = this.classTransformations[className] || {});
+        thisClassTransformations[Transformation.prototype.name] = function(args) {
+            var nodeInstance = this;
+            return nodeInstance.transform(Transformation, args);
+        }
+    },
+
+    registerClassMethod: function(methodName, method, className) {
+        var thisClassMethods = (this.classMethods[className] = this.classMethods[className] || {});
+        thisClassMethods[methodName] = method;
+    },
+
+    registerExtension: function(extension) {
+        //debugger;
+        smartxml.Document.prototype.registerExtension.call(this, extension);
+        var doc = this;
+
+        _.pairs(extension.wlxmlClass).forEach(function(pair) {
+            var className = pair[0],
+                classExtension = pair[1];
+
+            _.pairs(classExtension.methods || {}).forEach(function(pair) {
+                var name = pair[0],
+                    method = pair[1];
+                doc.registerClassMethod(name, method, className);
+            });
+
+            _.pairs(classExtension.transformations || {}).forEach(function(pair) {
+                var name = pair[0],
+                    desc = pair[1];
+                doc.registerClassTransformation(transformations.createContextTransformation(desc, name), className);
+            }); 
+        });
+

     }
 
 });
     }
 
 });


@@ -245,7 +290,6 @@ var wlxmlClasses = {
     }
 };
 
     }
 };
 

-var classMethods = {};

 
 return {
     WLXMLDocumentFromXML: function(xml, options) {
 
 return {
     WLXMLDocumentFromXML: function(xml, options) {


@@ -255,29 +299,7 @@ return {
 
     WLXMLElementNodeFromXML: function(xml) {
         return this.WLXMLDocumentFromXML(xml).root;
 
     WLXMLElementNodeFromXML: function(xml) {
         return this.WLXMLDocumentFromXML(xml).root;

-    },
-
-    registerExtension: function(extension) {
-        extension.documentTransformations.forEach(function(method) {
-            WLXMLDocument.prototype.transformations.register(transformations.createContextTransformation(method));
-        });
-
-        _.pairs(extension.classMethods).forEach(function(pair) {
-            var className = pair[0],
-                methods = pair[1];
-            _.pairs(methods).forEach(function(pair) {
-                var methodName = pair[0],
-                    method = pair[1];
-                classMethods[className] = classMethods[className] || {};
-                classMethods[className][methodName] = method;
-            });
-            
-        });
-
-        _.extend(WLXMLDocument.prototype, extension.documentMethods);
-

     }
     }

-

 };
 
 });
\ No newline at end of file
 };
 
 });
\ No newline at end of file