X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/e9aaf1e41c5e695136d06f008c06b287da7d3eda..0bbec0dc1ee08f4855b030189a4025994150b38c:/src/wlxml/wlxml.js?ds=sidebyside diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js index 5194c19..1837e14 100644 --- a/src/wlxml/wlxml.js +++ b/src/wlxml/wlxml.js @@ -3,8 +3,10 @@ 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'; @@ -23,17 +25,39 @@ var WLXMLDocumentNodeMethods = { 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; }, -}; - -var AttributesList = function() {}; -AttributesList.prototype = Object.create({}); -AttributesList.prototype.keys = function() { - return _.keys(this); + 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) { @@ -58,7 +82,9 @@ var installObject = function(instance, klass) { }); 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); + } }); }; @@ -72,6 +98,9 @@ $.extend(WLXMLElementNode.prototype, WLXMLDocumentNodeMethods, smartxml.ElementN getClass: function() { return this.getAttr('class') || ''; }, + getClassHierarchy: function() { + return getClassLists(this.getClass()); + }, setClass: function(klass) { if(klass !== this.klass) { installObject(this, klass); @@ -85,37 +114,20 @@ $.extend(WLXMLElementNode.prototype, WLXMLDocumentNodeMethods, smartxml.ElementN 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() { @@ -172,43 +184,30 @@ $.extend(WLXMLElementNode.prototype, WLXMLDocumentNodeMethods, smartxml.ElementN $(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); +$.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; }; @@ -239,6 +238,12 @@ $.extend(WLXMLDocument.prototype, { metadataNode.remove(); }); nativeNode.normalize(); + $(nativeNode).find('*').each(function() { + if (this.childNodes.length === 0) { + var fakeTextNode = window.document.createTextNode(""); + this.appendChild(fakeTextNode); + } + }); $(nativeNode).find(':not(iframe)').addBack().contents() .filter(function() {return this.nodeType === Node.TEXT_NODE;}) @@ -248,7 +253,8 @@ $.extend(WLXMLDocument.prototype, { elParent = el.parent(), hasSpanParent = elParent.prop('tagName') === 'SPAN', hasSpanBefore = el.prev().length && $(el.prev()).prop('tagName') === 'SPAN', - hasSpanAfter = el.next().length && $(el.next()).prop('tagName') === 'SPAN'; + hasSpanAfter = el.next().length && $(el.next()).prop('tagName') === 'SPAN', + onlyChild = el.is(':only-child'); var addInfo = function(toAdd, where, transformed, original) { @@ -289,7 +295,7 @@ $.extend(WLXMLDocument.prototype, { } } - if(!text.transformed) { + if(!text.transformed && !onlyChild) { addInfo(text.original, 'below'); el.remove(); return true; // continue @@ -341,7 +347,6 @@ $.extend(WLXMLDocument.prototype, { }, registerExtension: function(extension) { - //debugger; smartxml.Document.prototype.registerExtension.call(this, extension); var doc = this; @@ -366,25 +371,17 @@ $.extend(WLXMLDocument.prototype, { }); -var wlxmlClasses = { - 'link': { - attrs: {href: {type: 'string'}} - } -}; - - return { WLXMLDocumentFromXML: function(xml, options, Factory) { - options = _.extend({wlxmlClasses: wlxmlClasses}, options); Factory = Factory || WLXMLDocument; return new Factory(xml, options); }, - WLXMLElementNodeFromXML: function(xml) { return this.WLXMLDocumentFromXML(xml).root; }, - WLXMLDocument: WLXMLDocument + WLXMLDocument: WLXMLDocument, + getClassHierarchy: getClassLists }; }); \ No newline at end of file