From: Mike Taylor <mike@indexdata.com>
Date: Thu, 15 May 2014 10:11:19 +0000 (+0100)
Subject: Use mkws.$ to access to toJSON method, as some applications that use
X-Git-Tag: 1.0.0~666^2~30
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=24f75e7a5780f8472030efebce39466fb64766a3;p=mkws-moved-to-github.git

Use mkws.$ to access to toJSON method, as some applications that use
their own jQuery might reassign the global $ to be a jQuery object
that doesn't have the JSON extension.
---

diff --git a/src/mkws-filter.js b/src/mkws-filter.js
index b8780da..4383ac9 100644
--- 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) {
@@ -45,9 +45,9 @@ 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.log("removeMatching() removing filter " + mkws.$.toJSON(filter));
       } else {
-        m_team.log("removeMatching() keeping filter " + $.toJSON(filter));
+        m_team.log("removeMatching() keeping filter " + mkws.$.toJSON(filter));
         newList.push(filter);
       }
     }