From 2e5983ddf8d4877d597bfabc1971dec65a7f735e Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Wed, 14 May 2014 14:52:00 +0100 Subject: [PATCH] Stash a local copy of $ (the jQuery object) in the mkws object. Thereafter, we can use mkws.$ to know we're getting the right jQuery object even if another jQuery version (or other library) redefines $. When showing and hiding widgets, use w.jqnode instead of $(w.node). Contributes to the fix of MWKS-185. --- src/mkws-core.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mkws-core.js b/src/mkws-core.js index 6eb53bd..39b942e 100644 --- a/src/mkws-core.js +++ b/src/mkws-core.js @@ -10,6 +10,7 @@ // authentication, and a hash of team objects, indexed by team-name. // var mkws = { + $: $, // Our own local copy of the jQuery object authenticated: false, log_level: 1, // Will be overridden from mkws.config, but // initial value allows jQuery popup to use logging. @@ -363,11 +364,11 @@ mkws.pagerNext = function(tname) { var w1 = team.widget(t + "-Container-" + from); var w2 = team.widget(t + "-Container-" + to); if (w1) { - $(w1.node).hide(); + w1.jqnode.hide(); } if (w2) { - $(w2.node).show(); - $(w.node).appendTo($(w2.node)); + w2.jqnode.show(); + w.jqnode.appendTo(w2.jqnode); } }); team.queue("resize-" + to).publish(); -- 1.7.10.4