Skip to content

Commit 9124539

Browse files
remove nextTick from makeRequire to stop freeing thread ensure mixins loads before dom parse
1 parent c70a2c1 commit 9124539

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

lib/web/requirejs/require.js

+8-15
Original file line numberDiff line numberDiff line change
@@ -1445,25 +1445,18 @@ var requirejs, require, define;
14451445
//Grab defines waiting in the global queue.
14461446
intakeDefines();
14471447

1448-
//Mark all the dependencies as needing to be loaded.
1449-
context.nextTick(function () {
1450-
//Some defines could have been added since the
1451-
//require call, collect them.
1452-
intakeDefines();
1448+
requireMod = getModule(makeModuleMap(null, relMap));
14531449

1454-
requireMod = getModule(makeModuleMap(null, relMap));
1450+
//Store if map config should be applied to this require
1451+
//call for dependencies.
1452+
requireMod.skipMap = options.skipMap;
14551453

1456-
//Store if map config should be applied to this require
1457-
//call for dependencies.
1458-
requireMod.skipMap = options.skipMap;
1459-
1460-
requireMod.init(deps, callback, errback, {
1461-
enabled: true
1462-
});
1463-
1464-
checkLoaded();
1454+
requireMod.init(deps, callback, errback, {
1455+
enabled: true
14651456
});
14661457

1458+
checkLoaded();
1459+
14671460
return localRequire;
14681461
}
14691462

0 commit comments

Comments
 (0)