fourth batch: fixing blocking span - passing all tests, linting

[fnpeditor.git] / src / wlxml / wlxml.js

diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js
index 4e1ddc6..0505116 100644 (file)
--- a/src/wlxml/wlxml.js
+++ b/src/wlxml/wlxml.js
@@ -12,16 +12,16 @@ define([
 
 
 var WLXMLDocumentNodeMethods =  {
 
 
 var WLXMLDocumentNodeMethods =  {

-    isInside: function(klass) {
-        var parent = this.getParent(klass);
+    isInside: function(query) {
+        var parent = this.getParent(query);

         return !!parent;
     },
         return !!parent;
     },

-    getParent: function(klass) {
+    getParent: function(query) {

         /* globals Node */
         var me = this.nodeType === Node.ELEMENT_NODE ? [this] : [],
             toret;
         me.concat(this.parents()).some(function(node) {
         /* globals Node */
         var me = this.nodeType === Node.ELEMENT_NODE ? [this] : [],
             toret;
         me.concat(this.parents()).some(function(node) {

-            if(node.is(klass)) {
+            if(node.is(query)) {

                 toret = node;
                 return true;
             }
                 toret = node;
                 return true;
             }


@@ -72,14 +72,21 @@ $.extend(WLXMLElementNode.prototype, WLXMLDocumentNodeMethods, smartxml.ElementN
     getClass: function() {
         return this.getAttr('class') || '';
     },
     getClass: function() {
         return this.getAttr('class') || '';
     },

+    getClassHierarchy: function() {
+        return getClassLists(this.getClass());
+    },

     setClass: function(klass) {
         if(klass !== this.klass) {
             installObject(this, klass);
             return this.setAttr('class', klass);
         }
     },
     setClass: function(klass) {
         if(klass !== this.klass) {
             installObject(this, klass);
             return this.setAttr('class', klass);
         }
     },

-    is: function(klass) {
-        return this.getClass().substr(0, klass.length) === klass;
+    is: function(query) {
+        if(typeof query === 'string') {
+            query = {klass: query};
+        }
+        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(),
     },
     getMetaAttributes: function() {
         var toret = new AttributesList(),


@@ -380,7 +387,8 @@ return {
         return this.WLXMLDocumentFromXML(xml).root;
     },
 
         return this.WLXMLDocumentFromXML(xml).root;
     },
 

-    WLXMLDocument: WLXMLDocument
+    WLXMLDocument: WLXMLDocument,
+    getClassHierarchy: getClassLists

 };
 
 });
\ No newline at end of file
 };
 
 });
\ No newline at end of file