10000 2.1.13 · requirejs/requirejs-npm@06a7362 · GitHub
[go: up one dir, main page]
Skip to content

Commit 06a7362

Browse files
jrburkejrburke
committed
2.1.13
1 parent 92df4aa commit 06a7362

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

‎requirejs/bin/r.js

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env node
22
/**
3-
* @license r.js 2.1.12 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
3+
* @license r.js 2.1.13 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
44
* Available via the MIT or new BSD license.
55
* see: http://github.com/jrburke/requirejs for details
66
*/
@@ -21,7 +21,7 @@ var requirejs, require, define, xpcUtil;
2121
(function (console, args, readFileFunc) {
2222
var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
2323
nodeDefine, exists, reqMain, loadedOptimizedLib, existsForNode, Cc, Ci,
24-
version = '2.1.12',
24+
version = '2.1.13',
2525
jsSuffixRegExp = /\.js$/,
2626
commandOption = '',
2727
useLibLoaded = {},
@@ -239,7 +239,7 @@ var requirejs, require, define, xpcUtil;
239239
}
240240

241241
/** vim: et:ts=4:sw=4:sts=4
242-
* @license RequireJS 2.1.12 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
242+
* @license RequireJS 2.1.13 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
243243
* Available via the MIT or new BSD license.
244244
* see: http://github.com/jrburke/requirejs for details
245245
*/
@@ -252,7 +252,7 @@ var requirejs, require, define, xpcUtil;
252252
(function (global) {
253253
var req, s, head, baseElement, dataMain, src,
254254
interactiveScript, currentlyAddingScript, mainScript, subPath,
255-
version = '2.1.12',
255+
version = '2.1.13',
256256
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
257257
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
258258
jsSuffixRegExp = /\.js$/,
@@ -484,12 +484,7 @@ var requirejs, require, define, xpcUtil;
484484
// still work when converted to a path, even though
485485
// as an ID it is less than ideal. In larger point
486486
// releases, may be better to just kick out an error.
487-
// Also, want to keep IDs that start with 'a/../', so
488-
// that the 'a' part can be used for ID-to-path mapping
489-
// configs like paths/packages config. This is done
490-
// for legacy code expectations, since previous approach
491-
// in this method used that logic.
492-
if (i < 2 || ary[i - 1] === '..') {
487+
if (i === 0 || (i == 1 && ary[2] === '..') || ary[i - 1] === '..') {
493488
continue;
494489
} else if (i > 0) {
495490
ary.splice(i - 1, 2);

‎requirejs/require.js

Lines changed: 3 additions & 8 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.12 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
2+
* @license RequireJS 2.1.13 Copyright (c) 2010-2014, 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.12',
15+
version = '2.1.13',
1616
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
1717
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
1818
jsSuffixRegExp = /\.js$/,
@@ -244,12 +244,7 @@ var requirejs, require, define;
244244
// still work when converted to a path, even though
245245
// as an ID it is less than ideal. In larger point
246246
// releases, may be better to just kick out an error.
247-
// Also, want to keep IDs that start with 'a/../', so
248-
// that the 'a' part can be used for ID-to-path mapping
249-
// configs like paths/packages config. This is done
250-
// for legacy code expectations, since previous approach
251-
// in this method used that logic.
252-
if (i < 2 || ary[i - 1] === '..') {
247+
if (i === 0 || (i == 1 && ary[2] === '..') || ary[i - 1] === '..') {
253248
continue;
254249
} else if (i > 0) {
255250
ary.splice(i - 1, 2);

0 commit comments

Comments
 (0)
0