X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/b2e6eff88e29de706181587f619e0e4b125a5c56..84a0c8eeefe4f8ea5da616a0527f1f958cad893c:/src/wlxml/wlxml.js diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js index 0505116..f370223 100644 --- a/src/wlxml/wlxml.js +++ b/src/wlxml/wlxml.js @@ -3,8 +3,9 @@ define([ 'libs/underscore', 'smartxml/smartxml', 'smartxml/transformations', - 'wlxml/extensions/metadata/metadata' -], function($, _, smartxml, transformations, metadataExtension) { + 'wlxml/extensions/metadata/metadata', + 'wlxml/extensions/comments/comments' +], function($, _, smartxml, transformations, metadataExtension, commentExtension) { 'use strict'; @@ -58,7 +59,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); + } }); }; @@ -88,6 +91,11 @@ $.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); }, + hasChild: function(query) { + return this.contents().some(function(child) { + return child.is(query); + }.bind(this)); + }, getMetaAttributes: function() { var toret = new AttributesList(), classParts = [''].concat(this.getClass().split('.')), @@ -206,12 +214,14 @@ 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]); this.options = options; };