Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use the xocom file, and turn on jquery.noConflict

  • Loading branch information...
commit 729e2c418b1414a167f13b4233d041cc7db5c1f1 1 parent 641b0d5
Luke Closs authored
View
1  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)
View
3  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
View
1  web/xocom.js
@@ -3406,6 +3406,7 @@ jQuery.fn.offset = function() {
return results;
};
})();
+jQuery.noConflict();
/*
* XOCom Javascript Source
*
View
2  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
Please sign in to comment.
Something went wrong with that request. Please try again.