Skip to content

Commit df7531c

Browse files
jrburkejrburke
committed
rev for 2.1.18
1 parent 41d0ff3 commit df7531c

File tree

3 files changed

+30
-22
lines changed

3 files changed

+30
-22
lines changed

‎build/jslib/x.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license r.js 2.1.17+ Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved.
2+
* @license r.js 2.1.18 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.17+',
23+
version = '2.1.18',
2424
jsSuffixRegExp = /\.js$/,
2525
commandOption = '',
2626
useLibLoaded = {},

‎dist/r.js

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license r.js 2.1.17+ Fri, 29 May 2015 00:06:39 GMT Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved.
2+
* @license r.js 2.1.18 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.17+ Fri, 29 May 2015 00:06:39 GMT',
23+
version = '2.1.18',
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.17 Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved.
252+
* @license RequireJS 2.1.18 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.17',
265+
version = '2.1.18',
266266
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
267267
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
268268
jsSuffixRegExp = /\.js$/,
@@ -839,7 +839,7 @@ var requirejs, require, define, xpcUtil;
839839
id: mod.map.id,
840840
uri: mod.map.url,
841841
config: function () {
842-
return getOwn(config.config, mod.map.id) || {};
842+
return getOwn(config.config, mod.map.id) || {};
843843
},
844844
exports: mod.exports || (mod.exports = {})
845845
});
@@ -1367,6 +1367,9 @@ var requirejs, require, define, xpcUtil;
13671367
this.depCount += 1;
13681368

13691369
on(depMap, 'defined', bind(this, function (depExports) {
1370+
if (this.undefed) {
1371+
return;
1372+
}
13701373
this.defineDep(i, depExports);
13711374
this.check();
13721375
}));
@@ -1483,7 +1486,8 @@ var requirejs, require, define, xpcUtil;
14831486
while (defQueue.length) {
14841487
args = defQueue.shift();
14851488
if (args[0] === null) {
1486-
return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1]));
1489+
return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' +
1490+
args[args.length - 1]));
14871491
} else {
14881492
//args are id, deps, factory. Should be normalized by the
14891493
//define() function.
@@ -1570,7 +1574,7 @@ var requirejs, require, define, xpcUtil;
15701574
each(cfg.packages, function (pkgObj) {
15711575
var location, name;
15721576

1573-
pkgObj = typeof pkgObj === 'string' ? { name: pkgObj } : pkgObj;
1577+
pkgObj = typeof pkgObj === 'string' ? {name: pkgObj} : pkgObj;
15741578

15751579
name = pkgObj.name;
15761580
location = pkgObj.location;
@@ -1597,7 +1601,7 @@ var requirejs, require, define, xpcUtil;
15971601
//late to modify them, and ignore unnormalized ones
15981602
//since they are transient.
15991603
if (!mod.inited && !mod.map.unnormalized) {
1600-
mod.map = makeModuleMap(id);
1604+
mod.map = makeModuleMap(id, null, true);
16011605
}
16021606
});
16031607

@@ -1733,6 +1737,7 @@ var requirejs, require, define, xpcUtil;
17331737
var map = makeModuleMap(id, relMap, true),
17341738
mod = getOwn(registry, id);
17351739

1740+
mod.undefed = true;
17361741
removeScript(id);
17371742

17381743
delete defined[id];
@@ -1743,7 +1748,7 @@ var requirejs, require, define, xpcUtil;
17431748
//in array so that the splices do not
17441749
//mess up the iteration.
17451750
eachReverse(defQueue, function(args, i) {
1746-
if(args[0] === id) {
1751+
if (args[0] === id) {
17471752
defQueue.splice(i, 1);
17481753
}
17491754
});
@@ -2230,7 +2235,7 @@ var requirejs, require, define, xpcUtil;
22302235
//like a module name.
22312236
mainScript = mainScript.replace(jsSuffixRegExp, '');
22322237

2233-
//If mainScript is still a path, fall back to dataMain
2238+
//If mainScript is still a path, fall back to dataMain
22342239
if (req.jsExtRegExp.test(mainScript)) {
22352240
mainScript = dataMain;
22362241
}
@@ -2316,7 +2321,6 @@ var requirejs, require, define, xpcUtil;
23162321
jQuery: true
23172322
};
23182323

2319-
23202324
/**
23212325
* Executes the text. Normally just uses eval, but can be modified
23222326
* to use a better, environment-specific call. Only used for transpiling

‎require.js

Lines changed: 13 additions & 9 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.17 Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved.
2+
* @license RequireJS 2.1.18 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.17',
15+
version = '2.1.18',
1616
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
1717
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
1818
jsSuffixRegExp = /\.js$/,
@@ -589,7 +589,7 @@ var requirejs, require, define;
589589
id: mod.map.id,
590590
uri: mod.map.url,
591591
config: function () {
592-
return getOwn(config.config, mod.map.id) || {};
592+
return getOwn(config.config, mod.map.id) || {};
593593
},
594594
exports: mod.exports || (mod.exports = {})
595595
});
@@ -1117,6 +1117,9 @@ var requirejs, require, define;
11171117
this.depCount += 1;
11181118

11191119
on(depMap, 'defined', bind(this, function (depExports) {
1120+
if (this.undefed) {
1121+
return;
1122+
}
11201123
this.defineDep(i, depExports);
11211124
this.check();
11221125
}));
@@ -1233,7 +1236,8 @@ var requirejs, require, define;
12331236
while (defQueue.length) {
12341237
args = defQueue.shift();
12351238
if (args[0] === null) {
1236-
return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1]));
1239+
return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' +
1240+
args[args.length - 1]));
12371241
} else {
12381242
//args are id, deps, factory. Should be normalized by the
12391243
//define() function.
@@ -1320,7 +1324,7 @@ var requirejs, require, define;
13201324
each(cfg.packages, function (pkgObj) {
13211325
var location, name;
13221326

1323-
pkgObj = typeof pkgObj === 'string' ? { name: pkgObj } : pkgObj;
1327+
pkgObj = typeof pkgObj === 'string' ? {name: pkgObj} : pkgObj;
13241328

13251329
name = pkgObj.name;
13261330
location = pkgObj.location;
@@ -1347,7 +1351,7 @@ var requirejs, require, define;
13471351
//late to modify them, and ignore unnormalized ones
13481352
//since they are transient.
13491353
if (!mod.inited && !mod.map.unnormalized) {
1350-
mod.map = makeModuleMap(id);
1354+
mod.map = makeModuleMap(id, null, true);
13511355
}
13521356
});
13531357

@@ -1483,6 +1487,7 @@ var requirejs, require, define;
14831487
var map = makeModuleMap(id, relMap, true),
14841488
mod = getOwn(registry, id);
14851489

1490+
mod.undefed = true;
14861491
removeScript(id);
14871492

14881493
delete defined[id];
@@ -1493,7 +1498,7 @@ var requirejs, require, define;
14931498
//in array so that the splices do not
14941499
//mess up the iteration.
14951500
eachReverse(defQueue, function(args, i) {
1496-
if(args[0] === id) {
1501+
if (args[0] === id) {
14971502
defQueue.splice(i, 1);
14981503
}
14991504
});
@@ -1980,7 +1985,7 @@ var requirejs, require, define;
19801985
//like a module name.
19811986
mainScript = mainScript.replace(jsSuffixRegExp, '');
19821987

1983-
//If mainScript is still a path, fall back to dataMain
1988+
//If mainScript is still a path, fall back to dataMain
19841989
if (req.jsExtRegExp.test(mainScript)) {
19851990
mainScript = dataMain;
19861991
}
@@ -2066,7 +2071,6 @@ var requirejs, require, define;
20662071
jQuery: true
20672072
};
20682073

2069-
20702074
/**
20712075
* Executes the text. Normally just uses eval, but can be modified
20722076
* to use a better, environment-specific call. Only used for transpiling

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy