🌐 AI搜索 & 代理 主页
Skip to content

Commit 3941a85

Browse files
jrburkejrburke
committed
2.3.3
1 parent 4ba1dbc commit 3941a85

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
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.3.2+ Copyright jQuery Foundation and other contributors.
2+
* @license r.js 2.3.3 Copyright jQuery Foundation and other contributors.
33
* Released under MIT license, http://github.com/requirejs/r.js/LICENSE
44
*/
55

@@ -19,7 +19,7 @@ var requirejs, require, define, xpcUtil;
1919
(function (console, args, readFileFunc) {
2020
var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
2121
nodeDefine, exists, reqMain, loadedOptimizedLib, existsForNode, Cc, Ci,
22-
version = '2.3.2+',
22+
version = '2.3.3',
2323
jsSuffixRegExp = /\.js$/,
2424
commandOption = '',
2525
useLibLoaded = {},

‎dist/r.js‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license r.js 2.3.2+ Sun, 19 Feb 2017 04:01:40 GMT Copyright jQuery Foundation and other contributors.
2+
* @license r.js 2.3.3 Copyright jQuery Foundation and other contributors.
33
* Released under MIT license, http://github.com/requirejs/r.js/LICENSE
44
*/
55

@@ -19,7 +19,7 @@ var requirejs, require, define, xpcUtil;
1919
(function (console, args, readFileFunc) {
2020
var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
2121
nodeDefine, exists, reqMain, loadedOptimizedLib, existsForNode, Cc, Ci,
22-
version = '2.3.2+ Sun, 19 Feb 2017 04:01:40 GMT',
22+
version = '2.3.3',
2323
jsSuffixRegExp = /\.js$/,
2424
commandOption = '',
2525
useLibLoaded = {},
@@ -248,7 +248,7 @@ var requirejs, require, define, xpcUtil;
248248
}
249249

250250
/** vim: et:ts=4:sw=4:sts=4
251-
* @license RequireJS 2.3.2 Copyright jQuery Foundation and other contributors.
251+
* @license RequireJS 2.3.3 Copyright jQuery Foundation and other contributors.
252252
* Released under MIT license, https://github.com/requirejs/requirejs/blob/master/LICENSE
253253
*/
254254
//Not using strict: uneven strict support in browsers, #392, and causes
@@ -260,7 +260,7 @@ var requirejs, require, define, xpcUtil;
260260
(function (global, setTimeout) {
261261
var req, s, head, baseElement, dataMain, src,
262262
interactiveScript, currentlyAddingScript, mainScript, subPath,
263-
version = '2.3.2',
263+
version = '2.3.3',
264264
commentRegExp = /\/\*[\s\S]*?\*\/|([^:"'=]|^)\/\/.*$/mg,
265265
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
266266
jsSuffixRegExp = /\.js$/,
@@ -689,7 +689,9 @@ var requirejs, require, define, xpcUtil;
689689
//Account for relative paths if there is a base name.
690690
if (name) {
691691
if (prefix) {
692-
if (pluginModule && pluginModule.normalize) {
692+
if (isNormalized) {
693+
normalizedName = name;
694+
} else if (pluginModule && pluginModule.normalize) {
693695
//Plugin is loaded, use its normalize method.
694696
normalizedName = pluginModule.normalize(name, function (name) {
695697
return normalize(name, parentName, applyMap);
@@ -1221,7 +1223,8 @@ var requirejs, require, define, xpcUtil;
12211223
//prefix and name should already be normalized, no need
12221224
//for applying map config again either.
12231225
normalizedMap = makeModuleMap(map.prefix + '!' + name,
1224-
this.map.parentMap);
1226+
this.map.parentMap,
1227+
true);
12251228
on(normalizedMap,
12261229
'defined', bind(this, function (value) {
12271230
this.map.normalizedMap = normalizedMap;

‎require.js‎

Lines changed: 7 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.3.2 Copyright jQuery Foundation and other contributors.
2+
* @license RequireJS 2.3.3 Copyright jQuery Foundation and other contributors.
33
* Released under MIT license, https://github.com/requirejs/requirejs/blob/master/LICENSE
44
*/
55
//Not using strict: uneven strict support in browsers, #392, and causes
@@ -11,7 +11,7 @@ var requirejs, require, define;
1111
(function (global, setTimeout) {
1212
var req, s, head, baseElement, dataMain, src,
1313
interactiveScript, currentlyAddingScript, mainScript, subPath,
14-
version = '2.3.2',
14+
version = '2.3.3',
1515
commentRegExp = /\/\*[\s\S]*?\*\/|([^:"'=]|^)\/\/.*$/mg,
1616
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
1717
jsSuffixRegExp = /\.js$/,
@@ -440,7 +440,9 @@ var requirejs, require, define;
440440
//Account for relative paths if there is a base name.
441441
if (name) {
442442
if (prefix) {
443-
if (pluginModule && pluginModule.normalize) {
443+
if (isNormalized) {
444+
normalizedName = name;
445+
} else if (pluginModule && pluginModule.normalize) {
444446
//Plugin is loaded, use its normalize method.
445447
normalizedName = pluginModule.normalize(name, function (name) {
446448
return normalize(name, parentName, applyMap);
@@ -972,7 +974,8 @@ var requirejs, require, define;
972974
//prefix and name should already be normalized, no need
973975
//for applying map config again either.
974976
normalizedMap = makeModuleMap(map.prefix + '!' + name,
975-
this.map.parentMap);
977+
this.map.parentMap,
978+
true);
976979
on(normalizedMap,
977980
'defined', bind(this, function (value) {
978981
this.map.normalizedMap = normalizedMap;

0 commit comments

Comments
 (0)