Merge remote branch 'origin/MKWS-229'

[mkws-moved-to-github.git] / examples / htdocs / wolfram.html

diff --git a/examples/htdocs/wolfram.html b/examples/htdocs/wolfram.html
index 2c57e7a..a15f554 100644 (file)
--- a/examples/htdocs/wolfram.html
+++ b/examples/htdocs/wolfram.html
@@ -16,17 +16,18 @@
          service_proxy_auth : "/service-proxy-testauth"
       };
     </script>
-    <script type="text/javascript" src="src/jquery-1.10.0.min.js"></script>
-    <script type="text/javascript" src="src/pz2.js"></script>
-    <script type="text/javascript" src="src/handlebars-v1.1.2.js"></script>
-    <script type="text/javascript" src="src/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
    
-    <!-- <script type="text/javascript" src="src/mkws.js"></script> -->
+    <!-- <script type="text/javascript" src="tools/htdocs/mkws.js"></script> -->
     <script type="text/javascript" src="src/mkws-handlebars.js"></script>
     <script type="text/javascript" src="src/mkws-core.js"></script>
     <script type="text/javascript" src="src/mkws-team.js"></script>
     <script type="text/javascript" src="src/mkws-filter.js"></script>
-    <script type="text/javascript" src="src/mkws-widgets.js"></script>
+    <script type="text/javascript" src="src/mkws-widget.js"></script>
+    <script type="text/javascript" src="src/mkws-widget-main.js"></script>
     <script type="text/javascript" src="src/mkws-widget-termlists.js"></script>
     <script type="text/javascript" src="src/mkws-widget-authname.js"></script>
     <script type="text/javascript" src="src/mkws-widget-log.js"></script>
@@ -76,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>
+