canvas: Fix getting invalidated references to wlxmlNodes after node tag change

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

diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js
index 8d99cde..b3783af 100644 (file)
--- a/src/wlxml/wlxml.js
+++ b/src/wlxml/wlxml.js
@@ -7,6 +7,8 @@ define([
     
 'use strict';
 
     
 'use strict';
 

+/* globals Node */
+

 // utils
 
 var isMetaAttribute = function(attrName) {
 // utils
 
 var isMetaAttribute = function(attrName) {


@@ -22,24 +24,14 @@ AttributesList.prototype.keys = function() {
 };
 
 var installObject = function(instance, klass) {
 };
 
 var installObject = function(instance, klass) {

-    var methods = instance.document.classMethods[klass] || instance.document.classTransformations;
-    if(methods) {
-        instance.object = Object.create(_.extend({
-            transform: function(name, args) {
-                // TODO: refactor with DocumentElement.transform
-                var Transformation = instance.document.classTransformations[klass].get(name),
-                    transformation;
-                if(Transformation) {
-                    transformation = new Transformation(instance.document, instance, args);
-                }
-                return instance.document.transform(transformation);
-            }
-        }, 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) {
     smartxml.ElementNode.call(this, nativeNode, document);
 
 var WLXMLElementNode = function(nativeNode, document) {
     smartxml.ElementNode.call(this, nativeNode, document);


@@ -52,7 +44,6 @@ $.extend(WLXMLElementNode.prototype, smartxml.ElementNode.prototype, {
         return this.getAttr('class') || '';
     },
     setClass: function(klass) {
         return this.getAttr('class') || '';
     },
     setClass: function(klass) {

-        var methods, object;

         if(klass !== this.klass) {
             installObject(this, klass);
             return this.setAttr('class', klass);
         if(klass !== this.klass) {
             installObject(this, klass);
             return this.setAttr('class', klass);


@@ -137,57 +128,27 @@ $.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);
 
 
 
 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;
 
 WLXMLDocumentNode.prototype = Object.create(smartxml.DocumentNode.prototype);
 
 var WLXMLDocument = function(xml, options) {
     smartxml.Document.call(this, xml);
     this.options = options;
 

-    // this.DocumentNodeFactory = function() {
-    //     WLXMLDocumentNode.apply(this, arguments);
-    // };
-
-    // this.DocumentNodeFactory.prototype = Object.create(WLXMLDocumentNode.prototype);    
-    
-    this.ElementNodeFactory = function() {
-        WLXMLElementNode.apply(this, arguments);
-    }
-    this.ElementNodeFactory.prototype = Object.create(WLXMLElementNode.prototype);
-    this.ElementNodeFactory.prototype.transformations = new transformations.TransformationStorage();
-    this.ElementNodeFactory.prototype.registerTransformation = function(Transformation) {
-        return this.transformations.register(Transformation);
-    };
-    this.ElementNodeFactory.prototype.registerMethod = function(methodName, method) {
-        this[methodName] = method;
-    };
-
-    this.TextNodeFactory = function() {
-        smartxml.TextNode.apply(this, arguments);
-    }
-    this.TextNodeFactory.prototype = Object.create(smartxml.TextNode.prototype);
-    this.TextNodeFactory.prototype.transformations = new transformations.TransformationStorage();
-    this.TextNodeFactory.prototype.registerTransformation = function(Transformation) {
-        return this.transformations.register(Transformation);
-    };
-    this.TextNodeFactory.prototype.registerMethod = function(methodName, method) {
-        this[methodName] = method;
-    };
-

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


@@ -279,23 +240,18 @@ $.extend(WLXMLDocument.prototype, {
                         }
                     //}
                 }
                         }
                     //}
                 }

-
+                /* globals document */

                 el.replaceWith(document.createTextNode(text.transformed));
             });
         this.trigger('contentSet');
     },
 
                 el.replaceWith(document.createTextNode(text.transformed));
             });
         this.trigger('contentSet');
     },
 

-    registerMethod: function(methodName, method) {
-        this[methodName] = method;
-    },
-
-    registerTransformation: function(Transformation) {
-        return this.transformations.register(Transformation);
-    },
-

     registerClassTransformation: function(Transformation, className) {
     registerClassTransformation: function(Transformation, className) {

-        var thisClassTransformations = (this.classTransformations[className] = this.classTransformations[className] || new transformations.TransformationStorage());
-        return thisClassTransformations.register(Transformation);
+        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) {
     },
 
     registerClassMethod: function(methodName, method, className) {


@@ -305,55 +261,8 @@ $.extend(WLXMLDocument.prototype, {
 
     registerExtension: function(extension) {
         //debugger;
 
     registerExtension: function(extension) {
         //debugger;

-        var doc = this,
-            existingPropertyNames = _.values(this);
-
-        var getTrans = function(desc, methodName) {
-            if(typeof desc === 'function') {
-                desc = {impl: desc};
-            }
-            if(!desc.impl) {
-                throw new Error('Got transformation description without implementation.')
-            }
-            desc.name = desc.name || methodName;
-            return desc;
-        };
-
-        [
-            {source: extension.document, target: doc},
-            {source: extension.documentNode, target: [doc.ElementNodeFactory.prototype, doc.TextNodeFactory.prototype]},
-
-        ].forEach(function(mapping) {
-            if(mapping.source) {
-                if(mapping.source.methods) {
-                    existingPropertyNames = _.values(mapping.target)
-                    _.pairs(mapping.source.methods).forEach(function(pair) {
-                        var methodName = pair[0],
-                            method = pair[1],
-                            targets = _.isArray(mapping.target) ? mapping.target : [mapping.target];
-                        if(_.contains(existingPropertyNames, methodName)) {
-                            throw new Error('Cannot extend {target} with method name {methodName}. Name already exists.'
-                                .replace('{target}', mapping.target)
-                                .replace('{methodName}', methodName)
-                            );
-                        }
-                        targets.forEach(function(target) {
-                            target.registerMethod(methodName, method)
-                        });
-                    });
-                }
-
-                if(mapping.source.transformations) {
-                    _.pairs(mapping.source.transformations).forEach(function(pair) {
-                        var transformation = getTrans(pair[1], pair[0]),
-                            targets = _.isArray(mapping.target) ? mapping.target : [mapping.target];
-                        targets.forEach(function(target) {
-                            target.registerTransformation(transformations.createContextTransformation(transformation));
-                        });
-                    });
-                }
-            }
-        });
+        smartxml.Document.prototype.registerExtension.call(this, extension);
+        var doc = this;

 
         _.pairs(extension.wlxmlClass).forEach(function(pair) {
             var className = pair[0],
 
         _.pairs(extension.wlxmlClass).forEach(function(pair) {
             var className = pair[0],


@@ -366,9 +275,10 @@ $.extend(WLXMLDocument.prototype, {
             });
 
             _.pairs(classExtension.transformations || {}).forEach(function(pair) {
             });
 
             _.pairs(classExtension.transformations || {}).forEach(function(pair) {

-                var transformation = getTrans(pair[1], pair[0]);
-                doc.registerClassTransformation(transformations.createContextTransformation(transformation), className);
-            }); 
+                var name = pair[0],
+                    desc = pair[1];
+                doc.registerClassTransformation(transformations.createContextTransformation(desc, name), className);
+            });

         });
 
     }
         });
 
     }