X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/1a51f254c2c899b068ecfca66fd472ae79fadda3..248bc3fefa3eed44a6ffed7374bea9310962fb88:/src/wlxml/wlxml.js?ds=inline diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js index 5925ee6..40ab196 100644 --- a/src/wlxml/wlxml.js +++ b/src/wlxml/wlxml.js @@ -4,8 +4,9 @@ define([ 'smartxml/smartxml', 'smartxml/transformations', 'wlxml/extensions/metadata/metadata', - 'wlxml/extensions/comments/comments' -], function($, _, smartxml, transformations, metadataExtension, commentExtension) { + 'wlxml/extensions/comments/comments', + 'wlxml/extensions/edumed/edumed' +], function($, _, smartxml, transformations, metadataExtension, commentExtension, edumedExtension) { 'use strict'; @@ -24,11 +25,26 @@ var WLXMLDocumentNodeMethods = { me.concat(this.parents()).some(function(node) { if(node.is(query)) { toret = node; - return true; } - }); + 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 getClassLists = function(klassName) { @@ -90,6 +106,16 @@ $.extend(WLXMLElementNode.prototype, WLXMLDocumentNodeMethods, smartxml.ElementN return child.is(query); }.bind(this)); }, + find: function(query) { + var doc = this.document; + return this._$.find('*') + .map(function() { + return doc.createDocumentNode(this); + }) + .filter(function() { + return this.is(query); + }); + }, _getXMLDOMToDump: function() { var DOM = this._$.clone(true, true), @@ -169,7 +195,7 @@ $.extend(WLXMLTextNode.prototype, WLXMLDocumentNodeMethods, { var WLXMLDocument = function(xml, options) { this.classMethods = {}; this.classTransformations = {}; - smartxml.Document.call(this, xml, [metadataExtension, commentExtension]); + smartxml.Document.call(this, xml, [metadataExtension, commentExtension, edumedExtension]); this.options = options; };