From: Mike Taylor <mike@indexdata.com>
Date: Thu, 8 May 2014 16:00:55 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~699
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=d5f35a391c3e45de82cb9bf2c667281154429328;hp=d662af47d6eb8b1a1994a4fa817291af698d8d97;p=mkws-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
---

diff --git a/examples/htdocs/wolfram.html b/examples/htdocs/wolfram.html
index d744927..6ac1edd 100644
--- a/examples/htdocs/wolfram.html
+++ b/examples/htdocs/wolfram.html
@@ -77,5 +77,16 @@
         </td>
       </tr>
     </table>
+
+
+    <!-- <script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.js"></script> -->
+    <script type="text/javascript">
+      // check for the real jQuery / $ object
+      console.log("Reset jQuery and $ objection to null....");
+      $ = null;
+      jQuery = null;
+    </script>
+
   </body>
 </html>
+
diff --git a/src/mkws-core.js b/src/mkws-core.js
index 6371339..6eb53bd 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -311,6 +311,7 @@ mkws.pagerNext = function(tname) {
 // wrapper to call team() after page load
 (function(j) {
   var log = mkws.log;
+  var $ = j; // XXX
 
   function handleNodeWithTeam(node, callback) {
     // First branch for DOM objects; second branch for jQuery objects