X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/16c90b3616f1645aab9fe284fd3b89641dfb42f2..246796cf3b707c4c340edc7a1d51946fff8a278e:/src/wlxml/wlxml.js?ds=inline diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js index fe0636d..989fe5d 100644 --- a/src/wlxml/wlxml.js +++ b/src/wlxml/wlxml.js @@ -3,27 +3,88 @@ define([ 'libs/underscore', 'smartxml/smartxml', 'smartxml/transformations', - 'wlxml/extensions/metadata/metadata' -], function($, _, smartxml, transformations, metadataExtension) { + 'wlxml/extensions/metadata/metadata', + 'wlxml/extensions/comments/comments', + 'wlxml/extensions/edumed/edumed' +], function($, _, smartxml, transformations, metadataExtension, commentExtension, edumedExtension) { 'use strict'; /* globals Node */ -var AttributesList = function() {}; -AttributesList.prototype = Object.create({}); -AttributesList.prototype.keys = function() { - return _.keys(this); +var WLXMLDocumentNodeMethods = { + isInside: function(query) { + var parent = this.getParent(query); + return !!parent; + }, + getParent: function(query) { + /* globals Node */ + var me = this.nodeType === Node.ELEMENT_NODE ? [this] : [], + toret; + me.concat(this.parents()).some(function(node) { + if(node.is(query)) { + toret = node; + } + return !!toret || (!node.sameNode(this) && node.isContextRoot()); + }.bind(this)); + + return toret; + }, + isContextRoot: function() { + var me = this.nodeType === Node.ELEMENT_NODE ? [this] : [], + toret = false; + if(!this.parent()) { + return true; + } + me.concat(this.parents()).some(function(node) { + if(_.isFunction(node.object.isContextRoot) && node.object.isContextRoot(this)) { + toret = true; + return true; + } + }.bind(this)); + return toret; + }, + getContextRoot: function() { + var contextRoot; + [this].concat(this.parents()).some(function(n) { + if(n.isContextRoot()) { + contextRoot = n; + return true; + } + }); + return contextRoot; + }, + hasSameContextRoot: function(other) { + return this.getContextRoot().sameNode(other.getContextRoot()); + } +}; + +var getClassLists = function(klassName) { + var toret = [], + classParts = [''].concat(klassName.split('.')), + classCurrent; + + classParts.forEach(function(part) { + classCurrent = classCurrent ? classCurrent + '.' + part : part; + toret.push(classCurrent); + }); + return toret; }; var installObject = function(instance, klass) { - var methods = instance.document.classMethods[klass] || {}, - transformations = instance.document.classTransformations[klass] || {}; + var methods = {}, + transformations = {}; + getClassLists(klass).forEach(function(klassName) { + _.extend(methods, instance.document.classMethods[klassName] || {}); + _.extend(methods, instance.document.classTransformations[klassName] || {}); + }); instance.object = Object.create(_.extend({}, methods, transformations)); _.keys(methods).concat(_.keys(transformations)).forEach(function(key) { - instance.object[key] = _.bind(instance.object[key], instance); + if(_.isFunction(instance.object[key])) { + instance.object[key] = _.bind(instance.object[key], instance); + } }); }; @@ -33,50 +94,40 @@ var WLXMLElementNode = function(nativeNode, document) { }; WLXMLElementNode.prototype = Object.create(smartxml.ElementNode.prototype); -$.extend(WLXMLElementNode.prototype, smartxml.ElementNode.prototype, { +$.extend(WLXMLElementNode.prototype, WLXMLDocumentNodeMethods, smartxml.ElementNode.prototype, { getClass: function() { return this.getAttr('class') || ''; }, + getClassHierarchy: function() { + return getClassLists(this.getClass()); + }, setClass: function(klass) { if(klass !== this.klass) { installObject(this, klass); return this.setAttr('class', klass); } }, - is: function(klass) { - return this.getClass().substr(0, klass.length) === klass; + is: function(query) { + if(typeof query === 'string') { + query = {klass: query}; + } + return (_.isUndefined(query.klass) || this.getClass().substr(0, query.klass.length) === query.klass) && + (_.isUndefined(query.tagName) || this.getTagName() === query.tagName); }, - getMetaAttributes: function() { - var toret = new AttributesList(), - classParts = [''].concat(this.getClass().split('.')), - classCurrent, classDesc; - - classParts.forEach(function(part) { - classCurrent = classCurrent ? classCurrent + '.' + part : part; - classDesc = this.document.options.wlxmlClasses[classCurrent]; - if(classDesc) { - _.keys(classDesc.attrs).forEach(function(attrName) { - toret[attrName] = _.extend({value: this.getAttr(attrName)}, classDesc.attrs[attrName]); - }.bind(this)); - } + hasChild: function(query) { + return this.contents().some(function(child) { + return child.is(query); }.bind(this)); - return toret; }, - setMetaAttribute: function(key, value) { - this.setAttr(key, value); - }, - getOtherAttributes: function() { - var toret = {}, - node = this; - this.getAttrs().forEach(function(attr) { - 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); + find: function(query) { + var doc = this.document; + return this._$.find('*') + .map(function() { + return doc.createDocumentNode(this); + }) + .filter(function() { + return this.is(query); + }); }, _getXMLDOMToDump: function() { @@ -133,36 +184,30 @@ $.extend(WLXMLElementNode.prototype, smartxml.ElementNode.prototype, { $(this).prepend(metaNode); } } - }); - - return DOM; } }); -// 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 WLXMLTextNode = function() { + smartxml.TextNode.apply(this, arguments); +}; +WLXMLTextNode.prototype = Object.create(smartxml.TextNode.prototype); +$.extend(WLXMLTextNode.prototype, WLXMLDocumentNodeMethods, { + is: function() { return false; } +}); + var WLXMLDocument = function(xml, options) { this.classMethods = {}; this.classTransformations = {}; - smartxml.Document.call(this, xml, [metadataExtension]); + smartxml.Document.call(this, xml, [metadataExtension, commentExtension, edumedExtension]); this.options = options; }; @@ -172,6 +217,7 @@ var formatter_prefix = '_wlxml_formatter_'; WLXMLDocument.prototype = Object.create(smartxml.Document.prototype); $.extend(WLXMLDocument.prototype, { ElementNodeFactory: WLXMLElementNode, + TextNodeFactory: WLXMLTextNode, loadXML: function(xml) { smartxml.Document.prototype.loadXML.call(this, xml, {silent: true}); this.trigger('contentSet'); @@ -192,6 +238,14 @@ $.extend(WLXMLDocument.prototype, { metadataNode.remove(); }); nativeNode.normalize(); + $(nativeNode).find('*').each(function() { + var emptyNode = this.childNodes.length === 0; + var endsWithSpan = !emptyNode && this.childNodes[this.childNodes.length - 1].nodeName.toLowerCase() === 'span'; + if(emptyNode || endsWithSpan) { + var fakeTextNode = window.document.createTextNode(""); + this.appendChild(fakeTextNode); + } + }); $(nativeNode).find(':not(iframe)').addBack().contents() .filter(function() {return this.nodeType === Node.TEXT_NODE;}) @@ -242,7 +296,7 @@ $.extend(WLXMLDocument.prototype, { } } - if(!text.transformed) { + if(!text.transformed && !(el.is(':only-child') || (el.is(':last-child') && hasSpanBefore))) { addInfo(text.original, 'below'); el.remove(); return true; // continue @@ -281,8 +335,9 @@ $.extend(WLXMLDocument.prototype, { registerClassTransformation: function(Transformation, className) { var thisClassTransformations = (this.classTransformations[className] = this.classTransformations[className] || {}); - thisClassTransformations[Transformation.prototype.name] = function(args) { + thisClassTransformations[Transformation.prototype.name] = function() { var nodeInstance = this; + var args = Array.prototype.slice.call(arguments, 0); return nodeInstance.transform(Transformation, args); }; }, @@ -293,7 +348,6 @@ $.extend(WLXMLDocument.prototype, { }, registerExtension: function(extension) { - //debugger; smartxml.Document.prototype.registerExtension.call(this, extension); var doc = this; @@ -318,22 +372,17 @@ $.extend(WLXMLDocument.prototype, { }); -var wlxmlClasses = { - 'link': { - attrs: {href: {type: 'string'}} - } -}; - - return { - WLXMLDocumentFromXML: function(xml, options) { - options = _.extend({wlxmlClasses: wlxmlClasses}, options); - return new WLXMLDocument(xml, options); + WLXMLDocumentFromXML: function(xml, options, Factory) { + Factory = Factory || WLXMLDocument; + return new Factory(xml, options); }, - WLXMLElementNodeFromXML: function(xml) { return this.WLXMLDocumentFromXML(xml).root; - } + }, + + WLXMLDocument: WLXMLDocument, + getClassHierarchy: getClassLists }; }); \ No newline at end of file