Skip to content

Commit b8465a7

Browse files
jrburkejrburke
committed
requirejs 2.1.22
1 parent 31980da commit b8465a7

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

‎tools/r.js‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license r.js 2.1.21 Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved.
2+
* @license r.js 2.1.22 Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved.
33
* Available via the MIT or new BSD license.
44
* see: http://github.com/jrburke/requirejs for details
55
*/
@@ -20,7 +20,7 @@ var requirejs, require, define, xpcUtil;
2020
(function (console, args, readFileFunc) {
2121
var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
2222
nodeDefine, exists, reqMain, loadedOptimizedLib, existsForNode, Cc, Ci,
23-
version = '2.1.21',
23+
version = '2.1.22',
2424
jsSuffixRegExp = /\.js$/,
2525
commandOption = '',
2626
useLibLoaded = {},
@@ -249,7 +249,7 @@ var requirejs, require, define, xpcUtil;
249249
}
250250

251251
/** vim: et:ts=4:sw=4:sts=4
252-
* @license RequireJS 2.1.21 Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved.
252+
* @license RequireJS 2.1.22 Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved.
253253
* Available via the MIT or new BSD license.
254254
* see: http://github.com/jrburke/requirejs for details
255255
*/
@@ -262,7 +262,7 @@ var requirejs, require, define, xpcUtil;
262262
(function (global) {
263263
var req, s, head, baseElement, dataMain, src,
264264
interactiveScript, currentlyAddingScript, mainScript, subPath,
265-
version = '2.1.21',
265+
version = '2.1.22',
266266
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
267267
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
268268
jsSuffixRegExp = /\.js$/,
@@ -1166,7 +1166,11 @@ var requirejs, require, define, xpcUtil;
11661166
defined[id] = exports;
11671167

11681168
if (req.onResourceLoad) {
1169-
req.onResourceLoad(context, this.map, this.depMaps);
1169+
var resLoadMaps = [];
1170+
each(this.depMaps, function (depMap) {
1171+
resLoadMaps.push(depMap.normalizedMap || depMap);
1172+
});
1173+
req.onResourceLoad(context, this.map, resLoadMaps);
11701174
}
11711175
}
11721176

@@ -1225,6 +1229,7 @@ var requirejs, require, define, xpcUtil;
12251229
this.map.parentMap);
12261230
on(normalizedMap,
12271231
'defined', bind(this, function (value) {
1232+
this.map.normalizedMap = normalizedMap;
12281233
this.init([], function () { return value; }, null, {
12291234
enabled: true,
12301235
ignore: true
@@ -1961,7 +1966,7 @@ var requirejs, require, define, xpcUtil;
19611966
* Callback for script errors.
19621967
*/
19631968
onScriptError: function (evt) {
1964-
data = getScriptData(evt);
1969+
var data = getScriptData(evt);
19651970
if (!hasPathFallback(data.id)) {
19661971
var parents = [];
19671972
eachProp(registry, function(value, key) {

‎www/js/lib/require.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** vim: et:ts=4:sw=4:sts=4
2-
* @license RequireJS 2.1.21 Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved.
2+
* @license RequireJS 2.1.22 Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved.
33
* Available via the MIT or new BSD license.
44
* see: http://github.com/jrburke/requirejs for details
55
*/
@@ -12,7 +12,7 @@ var requirejs, require, define;
1212
(function (global) {
1313
var req, s, head, baseElement, dataMain, src,
1414
interactiveScript, currentlyAddingScript, mainScript, subPath,
15-
version = '2.1.21',
15+
version = '2.1.22',
1616
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
1717
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
1818
jsSuffixRegExp = /\.js$/,
@@ -916,7 +916,11 @@ var requirejs, require, define;
916916
defined[id] = exports;
917917

918918
if (req.onResourceLoad) {
919-
req.onResourceLoad(context, this.map, this.depMaps);
919+
var resLoadMaps = [];
920+
each(this.depMaps, function (depMap) {
921+
resLoadMaps.push(depMap.normalizedMap || depMap);
922+
});
923+
req.onResourceLoad(context, this.map, resLoadMaps);
920924
}
921925
}
922926

@@ -975,6 +979,7 @@ var requirejs, require, define;
975979
this.map.parentMap);
976980
on(normalizedMap,
977981
'defined', bind(this, function (value) {
982+
this.map.normalizedMap = normalizedMap;
978983
this.init([], function () { return value; }, null, {
979984
enabled: true,
980985
ignore: true
@@ -1711,7 +1716,7 @@ var requirejs, require, define;
17111716
* Callback for script errors.
17121717
*/
17131718
onScriptError: function (evt) {
1714-
data = getScriptData(evt);
1719+
var data = getScriptData(evt);
17151720
if (!hasPathFallback(data.id)) {
17161721
var parents = [];
17171722
eachProp(registry, function(value, key) {

0 commit comments

Comments
 (0)