X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/5a56f0121e2e8001a5f9910f018d273913e64635..7e4209de3c2972b1ca4ada5e3de85197365f58af:/src/wlxml/wlxml.js diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js index d67fe31..016f793 100644 --- a/src/wlxml/wlxml.js +++ b/src/wlxml/wlxml.js @@ -22,23 +22,13 @@ AttributesList.prototype.keys = function() { }; 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) { @@ -137,15 +127,15 @@ $.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; +// } +// })); @@ -158,30 +148,6 @@ 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.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.classMethods = {}; this.classTransformations = {}; }; @@ -279,13 +245,12 @@ $.extend(WLXMLDocument.prototype, { this.trigger('contentSet'); }, - registerTransformation: function(Transformation) { - return this.transformations.register(Transformation); - }, - 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) { @@ -295,55 +260,8 @@ $.extend(WLXMLDocument.prototype, { 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[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], @@ -356,8 +274,9 @@ $.extend(WLXMLDocument.prototype, { }); _.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); }); });