From 24f75e7a5780f8472030efebce39466fb64766a3 Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Thu, 15 May 2014 11:11:19 +0100 Subject: [PATCH] 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. --- src/mkws-filter.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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); } } -- 1.7.10.4