Permalink
Browse files

updated r.js to latest

  • Loading branch information...
1 parent 13a59a0 commit c1eb524151fbf33b791ee463317dd7c71e0b9034 @jbasdf jbasdf committed Dec 22, 2011
Showing with 6 additions and 15 deletions.
  1. +6 −15 public/js/r.js
View
21 public/js/r.js
@@ -1,5 +1,5 @@
/**
- * @license r.js 1.0.2+ 20111216 7:40pm Pacific Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
+ * @license r.js 1.0.2+ 20111222 3:30pm Pacific Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license.
* see: http://github.com/jrburke/requirejs for details
*/
@@ -20,7 +20,7 @@ var requirejs, require, define;
var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
nodeDefine, exists, reqMain, loadedOptimizedLib,
- version = '1.0.2+ 20111216 7:40pm Pacific',
+ version = '1.0.2+ 20111222 3:30pm Pacific',
jsSuffixRegExp = /\.js$/,
commandOption = '',
//Used by jslib/rhino/args.js
@@ -101,7 +101,7 @@ var requirejs, require, define;
}
/** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 1.0.2 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS 1.0.2+ Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license.
* see: http://github.com/jrburke/requirejs for details
*/
@@ -113,7 +113,7 @@ var requirejs, require, define;
(function () {
//Change this version number for each release.
- var version = "1.0.2",
+ var version = "1.0.2+",
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
cjsRequireRegExp = /require\(\s*["']([^'"\s]+)["']\s*\)/g,
currDirRegExp = /^\.\//,
@@ -1423,11 +1423,6 @@ var requirejs, require, define;
} : null]);
}
- //If a global jQuery is defined, check for it. Need to do it here
- //instead of main() since stock jQuery does not register as
- //a module via define.
- jQueryCheck();
-
//Doing this scriptCount decrement branching because sync envs
//need to decrement after resume, otherwise it looks like
//loading is complete after the first dependency is fetched.
@@ -2041,10 +2036,6 @@ var requirejs, require, define;
//global queue, assign them to this context.
ctx.takeGlobalQueue();
- //Allow for jQuery to be loaded/already in the page, and if jQuery 1.4.3,
- //make sure to hold onto it for readyWait triggering.
- ctx.jQueryCheck();
-
if (!ctx.scriptCount) {
ctx.resume();
}
@@ -7075,7 +7066,7 @@ define('pragma', ['parse', 'logger'], function (parse, logger) {
//Namespace define jquery use:
fileContents = fileContents.replace(pragma.defineJQueryRegExp,
- "typeof " + ns + ".define === 'function' && " + ns + ".define.amd && " + ns + ".define.jQuery");
+ "typeof " + ns + ".define === 'function' && " + ns + ".define.amd && " + ns + ".define.amd.jQuery");
//Namespace has.js define use:
fileContents = fileContents.replace(pragma.defineHasRegExp,
@@ -9188,4 +9179,4 @@ function (args, build) {
}((typeof console !== 'undefined' ? console : undefined),
(typeof Packages !== 'undefined' ? Array.prototype.slice.call(arguments, 0) : []),
- (typeof readFile !== 'undefined' ? readFile : undefined)));
+ (typeof readFile !== 'undefined' ? readFile : undefined)));

0 comments on commit c1eb524

Please sign in to comment.