Skip to content

Commit b91cb44

Browse files
author
Chuck Dumont
authored
Merge pull request #159 from chuckdumont/work2
Fix issue with calling runtime require sans callback function
2 parents 67d6fb1 + c78b5eb commit b91cb44

File tree

3 files changed

+22
-1
lines changed

3 files changed

+22
-1
lines changed

lib/DojoAMDMainTemplate.runtime.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ module.exports = {
132132
errors.push({mid: mid, error: e});
133133
}
134134
});
135-
if (errors.length === 0) {
135+
if (callback && errors.length === 0) {
136136
callback.apply(this, modules);
137137
} else {
138138
var error = new Error("findModules");
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define([], function() {
2+
global.asyncDep3Promise.resolve();
3+
});

test/TestCases/dependencies/simple/index.js

+18
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,24 @@ define(["exports", "module", "./dep"], function(exports, module, dep) {
4242
}
4343
});
4444

45+
it("require sans callback", function(done) {
46+
var resolver;
47+
global.asyncDep3Promise = new Promise((resolve) => {
48+
resolver = resolve;
49+
});
50+
global.asyncDep3Promise.resolve = resolver;
51+
require(["asyncDep3"]);
52+
global.asyncDep3Promise.then(() => {
53+
try {
54+
var dep3 = ['asyncDep3'];
55+
require(dep3);
56+
} catch (err) {
57+
return done(err);
58+
}
59+
done();
60+
});
61+
});
62+
4563
it("runtime require failures", function(done) {
4664
var notTrue;
4765
if (notTrue) {

0 commit comments

Comments
 (0)