Skip to content
Browse files

Updated to jQuery 1.9.1

Removed jquery.ext.engine.* from the code base and rolled the functionality into engine.intro
Mimicked jQuery.browser functionality in R scope
  • Loading branch information...
1 parent afd9519 commit bdff280c1d8d9ca89bfd19bb51d87b3b384af887 @bfattori committed Feb 6, 2013
Showing with 6,334 additions and 5,568 deletions.
  1. +0 −11 .project
  2. +4 −3 build.xml
  3. +0 −1 demos/empty/empty.html
  4. +0 −1 demos/htmlcontext/index.html
  5. +0 −1 demos/isometric/index.html
  6. +0 −1 demos/physics/index.html
  7. +0 −1 demos/physics2/index.html
  8. +0 −1 demos/tilemap/editor.html
  9. +0 −1 demos/tilemap/index.html
  10. +0 −1 demos/vector/index.html
  11. +4 −4 engine/build/debug.console.js
  12. +41 −1 engine/build/engine.intro.js
  13. +2 −2 engine/build/engine.script.js
  14. +10 −10 engine/build/engine.support.js
  15. +4 −4 engine/components/input/wiimote.js
  16. +2 −2 engine/libs/jquery.ext.engine.js
  17. +40 −37 engine/libs/jquery.ext.engine.src.js
  18. +5 −16 engine/libs/jquery.js
  19. +6,160 −5,428 engine/libs/jquery.src.js
  20. +1 −1 engine/resources/loaders/imageloader.js
  21. +57 −17 engine/runtime/engine.js
  22. +2 −3 make/builder/design.txt
  23. +0 −1 test/SpecRunner.html
  24. +0 −1 test/manual/index.html
  25. +0 −1 tools/font_editor/index.html
  26. +1 −1 tools/level_editor/jquery.jdMenu.js
  27. +1 −1 tools/level_editor/jquery.jstree.js
  28. +0 −1 tools/sprite_editor/index.html
  29. +0 −1 tutorials/advanced_tutorial1/index.html
  30. +0 −1 tutorials/tutorial1/index.html
  31. +0 −1 tutorials/tutorial10/index.html
  32. +0 −1 tutorials/tutorial11/index.html
  33. +0 −1 tutorials/tutorial12/index.html
  34. +0 −1 tutorials/tutorial13/index.html
  35. +0 −1 tutorials/tutorial14/index.html
  36. +0 −1 tutorials/tutorial2/index.html
  37. +0 −1 tutorials/tutorial3/index.html
  38. +0 −1 tutorials/tutorial4/index.html
  39. +0 −1 tutorials/tutorial5/index.html
  40. +0 −1 tutorials/tutorial6/index.html
  41. +0 −1 tutorials/tutorial7/index.html
  42. +0 −1 tutorials/tutorial8/index.html
  43. +0 −1 tutorials/tutorial9/index.html
View
11 .project
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>Render Engine v2.0</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
View
7 build.xml
@@ -31,11 +31,13 @@
<property name="compress.option" value="engine.compress"/>
<!-- Dump the system date (this is for Windows) -->
- <exec executable="cmd.exe" outputproperty="build.date" >
+<!--
+ <exec executable="cmd.exe" outputproperty="build.date" >
<arg line="/c"/>
<arg line="date.exe"/>
- <arg line="/T"/>
+ <arg line="/T"/>
</exec>
+-->
<!--
<propertyregex property="build.date" input="${builddate.out}" select="\1">
<regexp pattern="\w+ ((\d+\/?){3})"/>
@@ -284,7 +286,6 @@
<include name="base.js"/>
<include name="Box2dWeb-2.1.a.3.js"/>
<include name="jquery.js"/>
- <include name="jquery.ext.engine.js"/>
<include name="soundmanager2.js"/>
<include name="soundmanager2.swf"/>
<include name="soundmanager2_flash9.swf"/>
View
1 demos/empty/empty.html
@@ -39,7 +39,6 @@
<!-- Supporting Libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
1 demos/htmlcontext/index.html
@@ -45,7 +45,6 @@
<!-- Supporting Libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
1 demos/isometric/index.html
@@ -45,7 +45,6 @@
<!-- Supporting Libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
1 demos/physics/index.html
@@ -49,7 +49,6 @@
<!-- Supporting Libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
1 demos/physics2/index.html
@@ -49,7 +49,6 @@
<!-- Supporting Libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
1 demos/tilemap/editor.html
@@ -46,7 +46,6 @@
<!-- Supporting Libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
1 demos/tilemap/index.html
@@ -46,7 +46,6 @@
<!-- Supporting Libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
1 demos/vector/index.html
@@ -51,7 +51,6 @@
<!-- Supporting Libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
8 engine/build/debug.console.js
@@ -188,20 +188,20 @@ R.debug.Console = Base.extend(/** @scope R.debug.Console.prototype */{
R.debug.Console.verbosity = R.debug.Console.DEBUGLEVEL_ERRORS;
R.debug.Console.enableDebugOutput = false;
-// if (R.engine.Support.checkBooleanParam("debug") && (R.engine.Support.checkBooleanParam("simWii") || jQuery.browser.Wii)) {
+// if (R.engine.Support.checkBooleanParam("debug") && (R.engine.Support.checkBooleanParam("simWii") || R.browser.Wii)) {
// R.debug.Console.consoleRef = new R.debug.HTML();
// }
// else if (typeof firebug !== "undefined" || (typeof console !== "undefined" && console.firebug)) {
// // Firebug or firebug lite
// R.debug.Console.consoleRef = new R.debug.Firebug();
// }
-// else if (typeof console !== "undefined" && jQuery.browser.msie) {
+// else if (typeof console !== "undefined" && R.browser.msie) {
// R.debug.Console.consoleRef = new R.debug.MSIE();
// }
-// else if (jQuery.browser.chrome || jQuery.browser.safari) {
+// else if (R.browser.chrome || R.browser.safari) {
// R.debug.Console.consoleRef = new R.debug.Webkit();
// }
-// else if (jQuery.browser.opera) {
+// else if (R.browser.opera) {
// R.debug.Console.consoleRef = new R.debug.Opera();
// }
// else {
View
42 engine/build/engine.intro.js
@@ -50,7 +50,47 @@ R._namespaces = {};
* @type {Object}
*/
R.global = this;
-
+
+// Mimic the jQuery.browser object
+R.browser = {
+ userAgent: navigator.userAgent.toLowerCase()
+};
+
+var uAMatcher = {
+ webkit: /(webkit)[ \/]([\w.]+)/,
+ opera: /(opera)(?:.*version)?[ \/]([\w.]+)/,
+ msie: /(msie) ([\w.]+)/,
+ mozilla: /(mozilla)(?:.*? rv:([\w.]+))?/,
+ chrome:/(chrome)/,
+ firefox:/(firefox)/,
+ Wii:/nintendo (wii)/,
+ android:/(android).*AppleWebKit/,
+ safariMobile:/(iphone|ipad|ipod)/,
+};
+
+for (var ua in uAMatcher)
+ if (uAMatcher.hasOwnProperty(ua)) {
+ var matcher = uAMatcher[ua].exec(R.browser.userAgent), version = matcher ? matcher[2] : null;
+ R.browser[ua] = (matcher && matcher[1] ? true : false);
+ R.browser.version = (version != null);
+ }
+
+$.extend(R.browser, {
+ WiiMote:((window.opera && window.opera.wiiremote) ? window.opera.wiiremote : null),
+ WiiScreenWidth:800,
+ WiiScreenHeight:460
+});
+
+// Chrome version
+if (R.browser.chrome) {
+ R.browser.version = /chrome\/([\d\.]*)\b/.exec(R.browser.userAgent)[1];
+}
+
+// Firefox version
+if (R.browser.firefox) {
+ R.browser.version = /firefox\/([\d\.]*)\b/.exec(R.browser.userAgent)[1];
+}
+
/**
* Declare a new namespace in R.
* @param ns {String} The namespace to declare
View
4 engine/build/engine.script.js
@@ -321,7 +321,7 @@ R.engine.Script = Base.extend(/** @scope R.engine.Script.prototype */{
}
/* pragma:DEBUG_END */
- if ($.browser.Wii) {
+ if (R.browser.Wii) {
$.get(scriptPath, function(data) {
@@ -392,7 +392,7 @@ R.engine.Script = Base.extend(/** @scope R.engine.Script.prototype */{
};
eFn.cb = cb;
- if ($.browser.msie) {
+ if (R.browser.msie) {
n.defer = true;
n.onreadystatechange = fn;
n.onerror = eFn;
View
20 engine/build/engine.support.js
@@ -417,16 +417,16 @@ R.engine.Support = Base.extend(/** @scope R.engine.Support.prototype */{
// Build support object
R.engine.Support._sysInfo = {
- "browser" : $.browser.chrome ? "chrome" :
- ($.browser.android ? "android" :
- ($.browser.Wii ? "wii" :
- ($.browser.safariMobile ? "safarimobile" :
- ($.browser.safari ? "safari" :
- ($.browser.firefox ? "firefox" :
- ($.browser.mozilla ? "mozilla" :
- ($.browser.opera ? "opera" :
- ($.browser.msie ? "msie" : "unknown")))))))),
- "version" : $.browser.version,
+ "browser" : R.browser.chrome ? "chrome" :
+ (R.browser.android ? "android" :
+ (R.browser.Wii ? "wii" :
+ (R.browser.safariMobile ? "safarimobile" :
+ (R.browser.safari ? "safari" :
+ (R.browser.firefox ? "firefox" :
+ (R.browser.mozilla ? "mozilla" :
+ (R.browser.opera ? "opera" :
+ (R.browser.msie ? "msie" : "unknown")))))))),
+ "version" : R.browser.version,
"agent": navigator.userAgent,
"platform": navigator.platform,
"cpu": navigator.cpuClass || navigator.oscpu,
View
8 engine/components/input/wiimote.js
@@ -116,7 +116,7 @@ R.components.input.Wiimote = function() {
self._mouseUpListener(evt);
});
- if (!$.browser.Wii) {
+ if (!R.browser.Wii) {
// In the absense of the WiiMote, we'll use the mouse as the pointer
ctx.addEvent(this, "mousemove", function(evt) {
self._mouseMoveListener(evt);
@@ -149,7 +149,7 @@ R.components.input.Wiimote = function() {
ctx.removeEvent(this, "mousedown");
ctx.removeEvent(this, "mouseup");
- if (!$.browser.Wii) {
+ if (!R.browser.Wii) {
// In the absence of the WiiMote, remove the mouse move handler
ctx.removeEvent(this, "mousemove");
}
@@ -309,13 +309,13 @@ R.components.input.Wiimote = function() {
* @private
*/
execute: function(renderContext, time, dt) {
- if (!$.browser.Wii) {
+ if (!R.browser.Wii) {
// If this isn't Opera for Wii, don't do anything
return;
}
// Run through the available Wiimotes
- var op = $.browser.WiiMote;
+ var op = R.browser.WiiMote;
for (var w = 0; w < 4; w++) {
var remote = op.update(w); // This fixes a dependency problem
View
4 engine/libs/jquery.ext.engine.js
@@ -27,6 +27,6 @@
* THE SOFTWARE.
*
*/
-var userAgent=navigator.userAgent.toLowerCase();$.extend(jQuery.browser,{chrome:/chrome/.test(userAgent),firefox:/firefox/.test(userAgent),Wii:/nintendo wii/.test(userAgent),android:/android/.test(userAgent)&&/AppleWebKit/.test(userAgent),safariMobile:/iphone|ipad|ipod/.test(userAgent)&&/safari/.test(userAgent),WiiMote:window.opera&&window.opera.wiiremote?window.opera.wiiremote:null,WiiScreenWidth:800,WiiScreenHeight:460});if(jQuery.browser.chrome)jQuery.browser.version=/chrome\/([\d\.]*)\b/.exec(userAgent)[1];
-if(jQuery.browser.firefox)jQuery.browser.version=/firefox\/([\d\.]*)\b/.exec(userAgent)[1];
+var userAgent=navigator.userAgent.toLowerCase();$.extend(R.browser,{chrome:/chrome/.test(userAgent),firefox:/firefox/.test(userAgent),Wii:/nintendo wii/.test(userAgent),android:/android/.test(userAgent)&&/AppleWebKit/.test(userAgent),safariMobile:/iphone|ipad|ipod/.test(userAgent)&&/safari/.test(userAgent),WiiMote:window.opera&&window.opera.wiiremote?window.opera.wiiremote:null,WiiScreenWidth:800,WiiScreenHeight:460});if(R.browser.chrome)R.browser.version=/chrome\/([\d\.]*)\b/.exec(userAgent)[1];
+if(R.browser.firefox)R.browser.version=/firefox\/([\d\.]*)\b/.exec(userAgent)[1];
jQuery.extend(jQuery.expr[":"],{"in":function(b,c,a){b=parseInt(a[3].split("-")[0]);a=parseInt(a[3].split("-")[1]);return c>=b&&c<=a},inx:function(b,c,a){b=parseInt(a[3].split("-")[0]);a=parseInt(a[3].split("-")[1]);return c>b&&c<a},notin:function(b,c,a){b=parseInt(a[3].split("-")[0]);a=parseInt(a[3].split("-")[1]);return c<=b||c>=a},notinx:function(b,c,a){b=parseInt(a[3].split("-")[0]);a=parseInt(a[3].split("-")[1]);return c<b||c>a},siblings:"jQuery(a).siblings(m[3]).length>0",parents:"jQuery(a).parents(m[3]).length>0"});
View
77 engine/libs/jquery.ext.engine.src.js
@@ -31,25 +31,28 @@
// Some new browser types we'd like to be able to detect
var userAgent = navigator.userAgent.toLowerCase();
-$.extend(jQuery.browser, {
- chrome: /chrome/.test( userAgent ),
- firefox: /firefox/.test( userAgent ),
- Wii: /nintendo wii/.test( userAgent ),
- android: /android/.test( userAgent ) && /AppleWebKit/.test( userAgent ),
- safariMobile: /iphone|ipad|ipod/.test( userAgent) && /safari/.test( userAgent ),
- WiiMote: ((window.opera && window.opera.wiiremote) ? window.opera.wiiremote : null),
- WiiScreenWidth: 800,
- WiiScreenHeight: 460
+// Add back the R.browser object
+R.browser = {};
+
+$.extend(R.browser, {
+ chrome:/chrome/.test(userAgent),
+ firefox:/firefox/.test(userAgent),
+ Wii:/nintendo wii/.test(userAgent),
+ android:/android/.test(userAgent) && /AppleWebKit/.test(userAgent),
+ safariMobile:/iphone|ipad|ipod/.test(userAgent) && /safari/.test(userAgent),
+ WiiMote:((window.opera && window.opera.wiiremote) ? window.opera.wiiremote : null),
+ WiiScreenWidth:800,
+ WiiScreenHeight:460
});
// Chrome version
-if (jQuery.browser.chrome) {
- jQuery.browser.version = /chrome\/([\d\.]*)\b/.exec( userAgent )[1];
+if (R.browser.chrome) {
+ R.browser.version = /chrome\/([\d\.]*)\b/.exec(userAgent)[1];
}
// Firefox version
-if (jQuery.browser.firefox) {
- jQuery.browser.version = /firefox\/([\d\.]*)\b/.exec( userAgent )[1];
+if (R.browser.firefox) {
+ R.browser.version = /firefox\/([\d\.]*)\b/.exec(userAgent)[1];
}
/* Addition of some selectors that jQuery doesn't provide:
@@ -60,27 +63,27 @@ if (jQuery.browser.firefox) {
* + ":notinx(X-Y)" - Select elements with an index outside X and Y, exclusive.
*/
jQuery.extend(jQuery.expr[':'],
-{
- "in": function(a,i,m) {
- var l = parseInt(m[3].split("-")[0]);
- var h = parseInt(m[3].split("-")[1]);
- return (i >= l && i <= h);
- },
- "inx": function(a,i,m) {
- var l = parseInt(m[3].split("-")[0]);
- var h = parseInt(m[3].split("-")[1]);
- return (i > l && i < h);
- },
- "notin": function(a,i,m) {
- var l = parseInt(m[3].split("-")[0]);
- var h = parseInt(m[3].split("-")[1]);
- return (i <= l || i >= h);
- },
- "notinx": function(a,i,m) {
- var l = parseInt(m[3].split("-")[0]);
- var h = parseInt(m[3].split("-")[1]);
- return (i < l || i > h);
- },
- "siblings" : "jQuery(a).siblings(m[3]).length>0",
- "parents" : "jQuery(a).parents(m[3]).length>0"
-});
+ {
+ "in":function (a, i, m) {
+ var l = parseInt(m[3].split("-")[0]);
+ var h = parseInt(m[3].split("-")[1]);
+ return (i >= l && i <= h);
+ },
+ "inx":function (a, i, m) {
+ var l = parseInt(m[3].split("-")[0]);
+ var h = parseInt(m[3].split("-")[1]);
+ return (i > l && i < h);
+ },
+ "notin":function (a, i, m) {
+ var l = parseInt(m[3].split("-")[0]);
+ var h = parseInt(m[3].split("-")[1]);
+ return (i <= l || i >= h);
+ },
+ "notinx":function (a, i, m) {
+ var l = parseInt(m[3].split("-")[0]);
+ var h = parseInt(m[3].split("-")[1]);
+ return (i < l || i > h);
+ },
+ "siblings":"jQuery(a).siblings(m[3]).length>0",
+ "parents":"jQuery(a).parents(m[3]).length>0"
+ });
View
21 engine/libs/jquery.js
5 additions, 16 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
11,588 engine/libs/jquery.src.js
6,160 additions, 5,428 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
2 engine/resources/loaders/imageloader.js
@@ -124,7 +124,7 @@ R.resources.loaders.ImageLoader = function(){
}
var thisObj = this;
- if (!$.browser.Wii) {
+ if (!R.browser.Wii) {
image.bind("load", function(){
thisObj.setReady(name, true);
});
View
74 engine/runtime/engine.js
@@ -50,7 +50,47 @@ R._namespaces = {};
* @type {Object}
*/
R.global = this;
-
+
+// Mimic the jQuery.browser object
+R.browser = {
+ userAgent: navigator.userAgent.toLowerCase()
+};
+
+var uAMatcher = {
+ webkit: /(webkit)[ \/]([\w.]+)/,
+ opera: /(opera)(?:.*version)?[ \/]([\w.]+)/,
+ msie: /(msie) ([\w.]+)/,
+ mozilla: /(mozilla)(?:.*? rv:([\w.]+))?/,
+ chrome:/(chrome)/,
+ firefox:/(firefox)/,
+ Wii:/nintendo (wii)/,
+ android:/(android).*AppleWebKit/,
+ safariMobile:/(iphone|ipad|ipod)/,
+};
+
+for (var ua in uAMatcher)
+ if (uAMatcher.hasOwnProperty(ua)) {
+ var matcher = uAMatcher[ua].exec(R.browser.userAgent), version = matcher ? matcher[2] : null;
+ R.browser[ua] = (matcher && matcher[1] ? true : false);
+ R.browser.version = (version != null);
+ }
+
+$.extend(R.browser, {
+ WiiMote:((window.opera && window.opera.wiiremote) ? window.opera.wiiremote : null),
+ WiiScreenWidth:800,
+ WiiScreenHeight:460
+});
+
+// Chrome version
+if (R.browser.chrome) {
+ R.browser.version = /chrome\/([\d\.]*)\b/.exec(R.browser.userAgent)[1];
+}
+
+// Firefox version
+if (R.browser.firefox) {
+ R.browser.version = /firefox\/([\d\.]*)\b/.exec(R.browser.userAgent)[1];
+}
+
/**
* Declare a new namespace in R.
* @param ns {String} The namespace to declare
@@ -468,20 +508,20 @@ R.debug.Console = Base.extend(/** @scope R.debug.Console.prototype */{
R.debug.Console.verbosity = R.debug.Console.DEBUGLEVEL_ERRORS;
R.debug.Console.enableDebugOutput = false;
-// if (R.engine.Support.checkBooleanParam("debug") && (R.engine.Support.checkBooleanParam("simWii") || jQuery.browser.Wii)) {
+// if (R.engine.Support.checkBooleanParam("debug") && (R.engine.Support.checkBooleanParam("simWii") || R.browser.Wii)) {
// R.debug.Console.consoleRef = new R.debug.HTML();
// }
// else if (typeof firebug !== "undefined" || (typeof console !== "undefined" && console.firebug)) {
// // Firebug or firebug lite
// R.debug.Console.consoleRef = new R.debug.Firebug();
// }
-// else if (typeof console !== "undefined" && jQuery.browser.msie) {
+// else if (typeof console !== "undefined" && R.browser.msie) {
// R.debug.Console.consoleRef = new R.debug.MSIE();
// }
-// else if (jQuery.browser.chrome || jQuery.browser.safari) {
+// else if (R.browser.chrome || R.browser.safari) {
// R.debug.Console.consoleRef = new R.debug.Webkit();
// }
-// else if (jQuery.browser.opera) {
+// else if (R.browser.opera) {
// R.debug.Console.consoleRef = new R.debug.Opera();
// }
// else {
@@ -1237,16 +1277,16 @@ R.engine.Support = Base.extend(/** @scope R.engine.Support.prototype */{
// Build support object
R.engine.Support._sysInfo = {
- "browser" : $.browser.chrome ? "chrome" :
- ($.browser.android ? "android" :
- ($.browser.Wii ? "wii" :
- ($.browser.safariMobile ? "safarimobile" :
- ($.browser.safari ? "safari" :
- ($.browser.firefox ? "firefox" :
- ($.browser.mozilla ? "mozilla" :
- ($.browser.opera ? "opera" :
- ($.browser.msie ? "msie" : "unknown")))))))),
- "version" : $.browser.version,
+ "browser" : R.browser.chrome ? "chrome" :
+ (R.browser.android ? "android" :
+ (R.browser.Wii ? "wii" :
+ (R.browser.safariMobile ? "safarimobile" :
+ (R.browser.safari ? "safari" :
+ (R.browser.firefox ? "firefox" :
+ (R.browser.mozilla ? "mozilla" :
+ (R.browser.opera ? "opera" :
+ (R.browser.msie ? "msie" : "unknown")))))))),
+ "version" : R.browser.version,
"agent": navigator.userAgent,
"platform": navigator.platform,
"cpu": navigator.cpuClass || navigator.oscpu,
@@ -3058,7 +3098,7 @@ R.engine.Script = Base.extend(/** @scope R.engine.Script.prototype */{
}
/* pragma:DEBUG_END */
- if ($.browser.Wii) {
+ if (R.browser.Wii) {
$.get(scriptPath, function(data) {
@@ -3129,7 +3169,7 @@ R.engine.Script = Base.extend(/** @scope R.engine.Script.prototype */{
};
eFn.cb = cb;
- if ($.browser.msie) {
+ if (R.browser.msie) {
n.defer = true;
n.onreadystatechange = fn;
n.onerror = eFn;
View
5 make/builder/design.txt
@@ -4,11 +4,10 @@ Create an index.html file which contains the <script> tags to load the base libr
1) base.js
2) jquery.js
- 3) jquery.ext.engine.js
- 4) sylvester.js
+ 3) sylvester.js
Add the engine runtime:
- 5) engine.js
+ 4) engine.js
Point to the "game.js" (or whatever it is called) file which will parse the "define" statements to
build a dependency tree and capture includes. Includes will be added to the index.html file to be
View
1 test/SpecRunner.html
@@ -11,7 +11,6 @@
<script type="text/javascript" src="../engine/libs/base.js"></script>
<script type="text/javascript" src="../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../engine/libs/sylvester.js"></script>
<!-- include source files here... -->
View
1 test/manual/index.html
@@ -48,7 +48,6 @@
<!-- Supporting Libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
1 tools/font_editor/index.html
@@ -46,7 +46,6 @@
<!-- Supporting Libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<script type="text/javascript" src="../../engine/libs/json2.js"></script>
View
2 tools/level_editor/jquery.jdMenu.js
@@ -60,7 +60,7 @@
onClick: null,
offsetX: 4,
offsetY: 2,
- iframe: $.browser.msie
+ iframe: R.browser.msie
};
// Our special parentsUntil method to get all parents up to and including the matched element
View
2 tools/level_editor/jquery.jstree.js
@@ -252,7 +252,7 @@
// load the css when DOM is ready
$(function() {
- // code is copied form jQuery ($.browser is deprecated + there is a bug in IE)
+ // code is copied form jQuery (R.browser is deprecated + there is a bug in IE)
var u = navigator.userAgent.toLowerCase(),
v = (u.match( /.+?(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [0,'0'])[1],
css_string = '' +
View
1 tools/sprite_editor/index.html
@@ -45,7 +45,6 @@
<!-- Supporting Libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
1 tutorials/advanced_tutorial1/index.html
@@ -9,7 +9,6 @@
<!-- Load the supporting libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
1 tutorials/tutorial1/index.html
@@ -9,7 +9,6 @@
<!-- Load the supporting libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
1 tutorials/tutorial10/index.html
@@ -45,7 +45,6 @@
<!-- Supporting Libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
1 tutorials/tutorial11/index.html
@@ -9,7 +9,6 @@
<!-- Supporting Libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
1 tutorials/tutorial12/index.html
@@ -12,7 +12,6 @@
<!-- Supporting Libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
1 tutorials/tutorial13/index.html
@@ -9,7 +9,6 @@
<!-- Supporting Libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.src.js"></script>
<!-- Load the main engine script -->
View
1 tutorials/tutorial14/index.html
@@ -9,7 +9,6 @@
<!-- Supporting Libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
1 tutorials/tutorial2/index.html
@@ -9,7 +9,6 @@
<!-- Load the supporting libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
1 tutorials/tutorial3/index.html
@@ -9,7 +9,6 @@
<!-- Load the supporting libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
1 tutorials/tutorial4/index.html
@@ -9,7 +9,6 @@
<!-- Load the supporting libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
1 tutorials/tutorial5/index.html
@@ -9,7 +9,6 @@
<!-- Load the supporting libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
1 tutorials/tutorial6/index.html
@@ -9,7 +9,6 @@
<!-- Load the supporting libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->
View
1 tutorials/tutorial7/index.html
@@ -9,7 +9,6 @@
<!-- Supporting Libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.src.js"></script>
<!-- Load the main engine script -->
View
1 tutorials/tutorial8/index.html
@@ -9,7 +9,6 @@
<!-- Supporting Libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.src.js"></script>
<!-- Load the main engine script -->
View
1 tutorials/tutorial9/index.html
@@ -9,7 +9,6 @@
<!-- Load the supporting libraries -->
<script type="text/javascript" src="../../engine/libs/base.js"></script>
<script type="text/javascript" src="../../engine/libs/jquery.js"></script>
- <script type="text/javascript" src="../../engine/libs/jquery.ext.engine.js"></script>
<script type="text/javascript" src="../../engine/libs/sylvester.js"></script>
<!-- Load the main engine script -->

0 comments on commit bdff280

Please sign in to comment.
Something went wrong with that request. Please try again.