vendor/assets/javascripts/require.js in requirejs-rails-0.5.1 vs vendor/assets/javascripts/require.js in requirejs-rails-0.5.2

- old
+ new

@@ -1,7 +1,7 @@ /** 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.3 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 */ /*jslint strict: false, plusplus: false, sub: true */ /*global window: false, navigator: false, document: false, importScripts: false, @@ -9,11 +9,11 @@ setTimeout: false, opera: false */ var requirejs, require, define; (function () { //Change this version number for each release. - var version = "1.0.2", + var version = "1.0.3", commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg, cjsRequireRegExp = /require\(\s*["']([^'"\s]+)["']\s*\)/g, currDirRegExp = /^\.\//, jsSuffixRegExp = /\.js$/, ostring = Object.prototype.toString, @@ -1319,15 +1319,10 @@ function () { return jQuery; } : 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. //For browsers, it works fine to decrement after, but it means //the checkLoaded setTimeout 50 ms cost is taken. To avoid @@ -1936,13 +1931,9 @@ ctx.requireWait = false; //Any modules included with the require.js file will be in the //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(); } req.checkReadyState();