Cleaning up MKWS-58.

[mkws-moved-to-github.git] / src / mkws-filter.js

diff --git a/src/mkws-filter.js b/src/mkws-filter.js
index b521529..0b2ea63 100644 (file)
--- a/src/mkws-filter.js
+++ b/src/mkws-filter.js
@@ -6,7 +6,7 @@ function filterSet(team) {
   var that = {};
 
   that.toJSON = function() {
-    return $.toJSON(m_list);
+    return mkws.$.toJSON(m_list);
   };
 
   that.add = function(filter) {
@@ -17,7 +17,7 @@ function filterSet(team) {
     for (var i in m_list) {
       var filter = m_list[i];
       if (filter.type === 'target') {
-       callback(filter.id, filter.name);
+        callback(filter.id, filter.name);
       }
     }
   };
@@ -26,7 +26,7 @@ function filterSet(team) {
     for (var i in m_list) {
       var filter = m_list[i];
       if (filter.type === 'field') {
-       callback(filter.field, filter.value);
+        callback(filter.field, filter.value);
       }
     }
   };
@@ -35,7 +35,7 @@ function filterSet(team) {
     for (var i in m_list) {
       var filter = m_list[i];
       if (filter.type === 'category') {
-       callback(filter.id);
+        callback(filter.id);
       }
     }
   };
@@ -45,10 +45,10 @@ function filterSet(team) {
     for (var i in m_list) {
       var filter = m_list[i];
       if (matchFn(filter)) {
-       m_team.log("removeMatching() removing filter " + $.toJSON(filter));
+        m_team.info("removeMatching: removing filter " + mkws.$.toJSON(filter));
       } else {
-       m_team.log("removeMatching() keeping filter " + $.toJSON(filter));
-       newList.push(filter);
+        m_team.info("removeMatching: keeping filter " + mkws.$.toJSON(filter));
+        newList.push(filter);
       }
     }
     m_list = newList;
@@ -57,8 +57,8 @@ function filterSet(team) {
   that.targetFiltered = function(id) {
     for (var i = 0; i < m_list.length; i++) {
       if (m_list[i].type === 'target' ||
-         m_list[i].id === 'pz:id=' + id) {
-       return true;
+          m_list[i].id === 'pz:id=' + id) {
+        return true;
       }
     }
     return false;
@@ -70,9 +70,9 @@ function filterSet(team) {
     that.visitTargets(function(id, name) {
       if (res) res += ",";
       if (id.match(/^[a-z:]+[=~]/)) {
-       m_team.log("filter '" + id + "' already begins with SETTING OP");
+        m_team.info("filter '" + id + "' already begins with SETTING OP");
       } else {
-       id = 'pz:id=' + id;
+        id = 'pz:id=' + id;
       }
       res += id;
     });
@@ -95,7 +95,7 @@ function filterSet(team) {
 
     that.visitCategories(function(id) {
       if (res) res += ",";
-      res += "category~" + id.replace(/[\\|,]/g, '\\$&');
+      res += "category~" + id.replace(/[\\,]/g, '\\$&');
     });
     return res;
   }
@@ -124,6 +124,6 @@ function fieldFilter(field, value) {
 function categoryFilter(id) {
   return {
     type: 'category',
-    id: id,
+    id: id
   };
 }