[Pkg-javascript-commits] [dojo] 24/87: fixed whitespace change improperly committed in [27781]; refs #14459; !strict
David Prévot
taffit at moszumanska.debian.org
Thu Aug 21 17:39:15 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to annotated tag 1.7.5
in repository dojo.
commit 0023d1e5d5d3422ca257d46044548a2ee1cd289a
Author: Rawld Gill <rgill at altoviso.com>
Date: Wed Feb 8 01:07:15 2012 +0000
fixed whitespace change improperly committed in [27781]; refs #14459; !strict
git-svn-id: http://svn.dojotoolkit.org/src/branches/1.7/dojo@27782 560b804f-0ae3-0310-86f3-f6aa0a117693
---
dojo.js | 66 ++++++++++++++++++++++++++++++++---------------------------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/dojo.js b/dojo.js
index 566211b..65b5a92 100644
--- a/dojo.js
+++ b/dojo.js
@@ -688,43 +688,43 @@
if(isArray(a1)){
// signature is (requestList [,callback])
- syntheticMid = "require*" + uid();
+ syntheticMid = "require*" + uid();
- // resolve the request list with respect to the reference module
- for(var mid, deps = [], i = 0; i < a1.length;){
- mid = a1[i++];
- if(mid in {exports:1, module:1}){
- throw makeError("illegalModuleId", mid);
- }
- deps.push(getModule(mid, referenceModule));
+ // resolve the request list with respect to the reference module
+ for(var mid, deps = [], i = 0; i < a1.length;){
+ mid = a1[i++];
+ if(mid in {exports:1, module:1}){
+ throw makeError("illegalModuleId", mid);
}
+ deps.push(getModule(mid, referenceModule));
+ }
- // construct a synthetic module to control execution of the requestList, and, optionally, callback
- module = mix(makeModuleInfo("", syntheticMid, 0, ""), {
- injected: arrived,
- deps: deps,
- def: a2 || noop,
- require: referenceModule ? referenceModule.require : req
- });
- modules[module.mid] = module;
-
- // checkComplete!=0 holds the idle signal; we're not idle if we're injecting dependencies
- injectDependencies(module);
-
- // try to immediately execute
- // if already traversing a factory tree, then strict causes circular dependency to abort the execution; maybe
- // it's possible to execute this require later after the current traversal completes and avoid the circular dependency.
- // ...but *always* insist on immediate in synch mode
- var strict = checkCompleteGuard && req.async;
- checkCompleteGuard++;
- execModule(module, strict);
- checkIdle();
- if(!module.executed){
- // some deps weren't on board or circular dependency detected and strict; therefore, push into the execQ
- execQ.push(module);
- }
- checkComplete();
+ // construct a synthetic module to control execution of the requestList, and, optionally, callback
+ module = mix(makeModuleInfo("", syntheticMid, 0, ""), {
+ injected: arrived,
+ deps: deps,
+ def: a2 || noop,
+ require: referenceModule ? referenceModule.require : req
+ });
+ modules[module.mid] = module;
+
+ // checkComplete!=0 holds the idle signal; we're not idle if we're injecting dependencies
+ injectDependencies(module);
+
+ // try to immediately execute
+ // if already traversing a factory tree, then strict causes circular dependency to abort the execution; maybe
+ // it's possible to execute this require later after the current traversal completes and avoid the circular dependency.
+ // ...but *always* insist on immediate in synch mode
+ var strict = checkCompleteGuard && req.async;
+ checkCompleteGuard++;
+ execModule(module, strict);
+ checkIdle();
+ if(!module.executed){
+ // some deps weren't on board or circular dependency detected and strict; therefore, push into the execQ
+ execQ.push(module);
}
+ checkComplete();
+ }
return contextRequire;
},
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git
More information about the Pkg-javascript-commits
mailing list