X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/5a56f0121e2e8001a5f9910f018d273913e64635..b5d516652ee4cc58a8a0636074456b344126f7d7:/src/wlxml/wlxml.js?ds=inline diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js index d67fe31..820b95f 100644 --- a/src/wlxml/wlxml.js +++ b/src/wlxml/wlxml.js @@ -7,13 +7,8 @@ define([ 'use strict'; -// utils +/* globals Node */ -var isMetaAttribute = function(attrName) { - return attrName.substr(0, 5) === 'meta-'; -}; - -// var AttributesList = function() {}; AttributesList.prototype = Object.create({}); @@ -22,24 +17,14 @@ 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) { smartxml.ElementNode.call(this, nativeNode, document); @@ -52,7 +37,6 @@ $.extend(WLXMLElementNode.prototype, smartxml.ElementNode.prototype, { return this.getAttr('class') || ''; }, setClass: function(klass) { - var methods, object; if(klass !== this.klass) { installObject(this, klass); return this.setAttr('class', klass); @@ -71,24 +55,28 @@ $.extend(WLXMLElementNode.prototype, smartxml.ElementNode.prototype, { classDesc = this.document.options.wlxmlClasses[classCurrent]; if(classDesc) { _.keys(classDesc.attrs).forEach(function(attrName) { - toret[attrName] = _.extend({value: this.getAttr('meta-' + attrName)}, classDesc.attrs[attrName]); + toret[attrName] = _.extend({value: this.getAttr(attrName)}, classDesc.attrs[attrName]); }.bind(this)); } }.bind(this)); return toret; }, setMetaAttribute: function(key, value) { - this.setAttr('meta-'+key, value); + this.setAttr(key, value); }, getOtherAttributes: function() { - var toret = {}; + var toret = {}, + node = this; this.getAttrs().forEach(function(attr) { - if(attr.name !== 'class' && !isMetaAttribute(attr.name)) { - toret[attr.name] = attr.value; + if(attr.name !== 'class' && !node.isMetaAttribute(attr.name)) { + toret[attr.name] = {value: attr.value}; } }); return toret; }, + isMetaAttribute: function(attrName) { + return attrName !== 'class' &&_.contains(_.keys(this.getMetaAttributes()), attrName); + }, _getXMLDOMToDump: function() { var DOM = this._$.clone(true, true); @@ -137,51 +125,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); -} +}; 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.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 = {}; }; @@ -194,7 +158,11 @@ $.extend(WLXMLDocument.prototype, { ElementNodeFactory: WLXMLElementNode, loadXML: function(xml) { smartxml.Document.prototype.loadXML.call(this, xml, {silent: true}); - $(this.dom).find(':not(iframe)').addBack().contents() + this.trigger('contentSet'); + }, + + normalizeXML: function(nativeNode) { + $(nativeNode).find(':not(iframe)').addBack().contents() .filter(function() {return this.nodeType === Node.TEXT_NODE;}) .each(function() { var el = $(this), @@ -273,19 +241,17 @@ $.extend(WLXMLDocument.prototype, { } //} } - + /* globals document */ el.replaceWith(document.createTextNode(text.transformed)); }); - 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 +261,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,9 +275,10 @@ $.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); + }); }); } @@ -366,8 +286,8 @@ $.extend(WLXMLDocument.prototype, { }); var wlxmlClasses = { - 'uri': { - attrs: {uri: {type: 'string'}} + 'link': { + attrs: {href: {type: 'string'}} } };