From: Aleksander Ɓukasz Date: Tue, 15 Jul 2014 12:59:41 +0000 (+0200) Subject: wlxml: removing unused code X-Git-Url: https://git.mdrn.pl/fnpeditor.git/commitdiff_plain/da4ff24177c122a81ecae0e7693ffe2a3276ba1a wlxml: removing unused code --- diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js index f370223..21623c5 100644 --- a/src/wlxml/wlxml.js +++ b/src/wlxml/wlxml.js @@ -31,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('.')), @@ -96,38 +90,6 @@ $.extend(WLXMLElementNode.prototype, WLXMLDocumentNodeMethods, smartxml.ElementN return child.is(query); }.bind(this)); }, - 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)); - } - }.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() { var DOM = this._$.clone(true, true), @@ -379,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; }, diff --git a/src/wlxml/wlxml.test.js b/src/wlxml/wlxml.test.js index af0e23b..7c69bdb 100644 --- a/src/wlxml/wlxml.test.js +++ b/src/wlxml/wlxml.test.js @@ -31,85 +31,6 @@ describe('WLXMLDocument', function() { var node = nodeFromXML('
'); expect(node.getClassHierarchy()).to.eql(['', 'a', 'a.b', 'a.b.c']); }); - - it('returns unregistered attributes', function() { - var testClasses = { - 'testClass': { - attrs: {'attr1': {type: 'string'}} - } - }, - doc = getDocumentFromXML('', {wlxmlClasses: testClasses}); - expect(doc.root.getOtherAttributes()).to.eql({attr: {value:'val'}}); - }); - }); - - describe('WLXML node meta attributes', function() { - - it('inherits keys from super classes', function() { - var testClasses = { - '': { - attrs: {'common': {type: 'string'}} - }, - 'a': { - attrs: {'a_attr': {type: 'string'}} - }, - 'a.b': { - attrs: {'a_b_attr': {type: 'string'}} - }, - 'a.b.c': { - attrs: {'a_b_c_attr': {type: 'string'}} - } - }, - doc = getDocumentFromXML('
', {wlxmlClasses: testClasses}), - section = doc.root; - - expect(section.getMetaAttributes().keys()).to.eql(['common']); - - section.setClass('a'); - expect(section.getMetaAttributes().keys().sort()).to.eql(['common', 'a_attr'].sort()); - - section.setClass('a.b'); - expect(section.getMetaAttributes().keys().sort()).to.eql(['common', 'a_attr', 'a_b_attr'].sort()); - - section.setClass('a.b.c'); - expect(section.getMetaAttributes().keys().sort()).to.eql(['common', 'a_attr', 'a_b_attr', 'a_b_c_attr'].sort()); - }); - - describe('api', function() { - it('returns meta attributes as a dict', function() { - var testClasses = { - 'test': { - attrs: { - attr1: {type: 'string'}, - attr2: {type: 'date'} - } - } - }, - node = getDocumentFromXML( - '', - {wlxmlClasses: testClasses} - ).root, - attrs = node.getMetaAttributes(); - - expect(attrs.keys().sort()).to.eql(['attr1', 'attr2'].sort()); - expect(attrs.attr1.value).to.equal('val1'); - expect(attrs.attr1.type).to.equal('string'); - expect(attrs.attr2.value).to.equal('2014-01-01'); - expect(attrs.attr2.type).to.equal('date'); - }); - it('returns undefined value if attribute is missing', function() { - var testClasses = { - 'test': { - attrs: { - attr1: {type: 'string'}, - } - } - }, - node = getDocumentFromXML('', {wlxmlClasses: testClasses}).root, - attrs = node.getMetaAttributes(); - expect(attrs.attr1.value).to.be.undefined; - }); - }); }); describe('White space handling', function() {