X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/e1e728df4cd9e96c5865fcec0762eaaf5b37a3f7..da4ff24177c122a81ecae0e7693ffe2a3276ba1a:/src/wlxml/wlxml.js

diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js
index 0505116..21623c5 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';
 
@@ -30,12 +31,6 @@ var WLXMLDocumentNodeMethods =  {
     },
 };
 
-var AttributesList = function() {};
-AttributesList.prototype = Object.create({});
-AttributesList.prototype.keys = function() {
-    return _.keys(this);
-};
-
 var getClassLists = function(klassName) {
     var toret = [],
         classParts = [''].concat(klassName.split('.')),
@@ -58,7 +53,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,37 +85,10 @@ $.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);
     },
 
     _getXMLDOMToDump: function() {
@@ -206,12 +176,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;
 };
 
@@ -369,20 +341,11 @@ $.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;
     },