Use the xocom file, and turn on jquery.noConflict

lukec · Apr 26, 2008 · 729e2c4 · 729e2c4
1 parent 641b0d5
commit 729e2c4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -7,4 +7,5 @@ clean:
 
 web/xocom.js: web/xo.js web/jquery.js Makefile
 	cat web/jquery.js > $(JS_TARGET)
+	echo "jQuery.noConflict();" >> $(JS_TARGET)
 	cat web/xo.js >> $(JS_TARGET)
diff --git a/web/index.html b/web/index.html
@@ -2,8 +2,7 @@
     <head>
       <title>XOCom Example</title>
     </head>
-    <script type="text/javascript" src="jquery.js"></script>
-    <script type="text/javascript" src="xo.js"></script>
+    <script type="text/javascript" src="xocom.js"></script>
     <script type="text/javascript">
         /*
          * This example code registers two simple functions

diff --git a/web/xocom.js b/web/xocom.js
@@ -3406,6 +3406,7 @@ jQuery.fn.offset = function() {
 	return results;
 };
 })();
+jQuery.noConflict();
 /*
  * XOCom Javascript Source
  *

diff --git a/xocom-activity-skeleton b/xocom-activity-skeleton
@@ -13,7 +13,7 @@ if [ ! -d web ]; then
 fi
 
 echo "Updating XOCom libraries"
-for f in XOCom.py web/xo.js; do
+for f in XOCom.py web/xocom.js; do
     echo "--> Fetching $f"
     wget --quiet -O $f "http://github.com/lukec/xocom/tree/master%2F$f?raw=true" 
 done