Skip to content

Commit

Permalink
Build the jquery+requirejs file with requirejs page load support, so …
Browse files Browse the repository at this point in the history
…that the user does not have to use the jquery ready if want to keep code loading concerns (with outstanding scripts blocking page ready callbacks) to be only in require-land.
  • Loading branch information
jrburke committed Aug 3, 2010
1 parent 8dd4e14 commit e6bc01c
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 4 deletions.
8 changes: 7 additions & 1 deletion build/jquery/jquery-1.4.2.js
Expand Up @@ -6251,7 +6251,13 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
window.jQuery = window.$ = jQuery;

if (useRequire) {
require.callReady = jQuery.callReady;
var oldReqCallReady = require.callReady;
require.callReady = function () {
if (oldReqCallReady) {
oldReqCallReady();
}
jQuery.callReady();
};
require.def("jquery", function() { return jQuery; });
require.def("jQuery", function() { return jQuery; });
}
Expand Down
1 change: 0 additions & 1 deletion build/jquery/require-jquery.build.js
Expand Up @@ -10,7 +10,6 @@
jquery: true,
requireExcludeModify: true,
requireExcludePlugin: true,
requireExcludePageLoad: true,
requireExcludeContext: true
}
}
1 change: 0 additions & 1 deletion build/jquery/requireplugins-jquery.build.js
Expand Up @@ -9,7 +9,6 @@
pragmas: {
jquery: true,
requireExcludeModify: true,
requireExcludePageLoad: true,
requireExcludeContext: true
}
}
2 changes: 1 addition & 1 deletion require.js
Expand Up @@ -16,7 +16,7 @@ setInterval: false, importScripts: false */
var require;
(function () {
//Change this version number for each release.
var version = "0.12.0",
var version = "0.12.0+",
empty = {}, s,
i, defContextName = "_", contextLoads = [],
scripts, script, rePkg, src, m, cfg, setReadyState,
Expand Down
1 change: 1 addition & 0 deletions tasks.txt
Expand Up @@ -14,6 +14,7 @@
- Deliver distribution of Dojo based on require
- manual fix for requireIf in dojo.gfx, like what is done for dojo._base

- Option to remove the script tag after the script loads. Does that help memory? Does it work in all browsers?

- Possibly change dependency stuff to call module as soon as just its dependencies
are ready instead of waiting for all the modules to "load", then are executed.
Expand Down

0 comments on commit e6bc01c

Please sign in to comment.