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

diff --git a/examples/htdocs/wolfram.html b/examples/htdocs/wolfram.html
index d744927..6ac1edd 100644 (file)
--- 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 4c9db87..69bd47d 100644 (file)
--- 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