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

Commit fd1f9a8

Browse files
jrburkejrburke
committed
Rev to 2.3.0
1 parent e601316 commit fd1f9a8

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
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.2.0+ Copyright jQuery Foundation and other contributors.
2+
* @license r.js 2.3.0 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.2.0+',
22+
version = '2.3.0',
2323
jsSuffixRegExp = /\.js$/,
2424
commandOption = '',
2525
useLibLoaded = {},

‎dist/r.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license r.js 2.2.0+ Sun, 04 Sep 2016 06:25:31 GMT Copyright jQuery Foundation and other contributors.
2+
* @license r.js 2.3.0 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.2.0+ Sun, 04 Sep 2016 06:25:31 GMT',
22+
version = '2.3.0',
2323
jsSuffixRegExp = /\.js$/,
2424
commandOption = '',
2525
useLibLoaded = {},
@@ -248,20 +248,20 @@ var requirejs, require, define, xpcUtil;
248248
}
249249

250250
/** vim: et:ts=4:sw=4:sts=4
251-
* @license RequireJS 2.2.0 Copyright jQuery Foundation and other contributors.
252-
* Released under MIT license, http://github.com/requirejs/requirejs/LICENSE
251+
* @license RequireJS 2.3.0 Copyright jQuery Foundation and other contributors.
252+
* 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
255255
//problems with requirejs.exec()/transpiler plugins that may not be strict.
256256
/*jslint regexp: true, nomen: true, sloppy: true */
257257
/*global window, navigator, document, importScripts, setTimeout, opera */
258258

259259

260-
(function (global) {
260+
(function (global, setTimeout) {
261261
var req, s, head, baseElement, dataMain, src,
262262
interactiveScript, currentlyAddingScript, mainScript, subPath,
263-
version = '2.2.0',
264-
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
263+
version = '2.3.0',
264+
commentRegExp = /\/\*[\s\S]*?\*\/|([^:"'=]|^)\/\/.*$/mg,
265265
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
266266
jsSuffixRegExp = /\.js$/,
267267
currDirRegExp = /^\.\//,
@@ -285,7 +285,7 @@ var requirejs, require, define, xpcUtil;
285285
useInteractive = false;
286286

287287
//Could match something like ')//comment', do not lose the prefix to comment.
288-
function commentReplace(match, multi, multiText, singlePrefix) {
288+
function commentReplace(match, singlePrefix) {
289289
return singlePrefix || '';
290290
}
291291

@@ -2388,7 +2388,7 @@ var requirejs, require, define, xpcUtil;
23882388

23892389
//Set up with config info.
23902390
req(cfg);
2391-
}(this));
2391+
}(this, setTimeout));
23922392

23932393

23942394

‎require.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/** vim: et:ts=4:sw=4:sts=4
2-
* @license RequireJS 2.2.0 Copyright jQuery Foundation and other contributors.
3-
* Released under MIT license, http://github.com/requirejs/requirejs/LICENSE
2+
* @license RequireJS 2.3.0 Copyright jQuery Foundation and other contributors.
3+
* 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
66
//problems with requirejs.exec()/transpiler plugins that may not be strict.
77
/*jslint regexp: true, nomen: true, sloppy: true */
88
/*global window, navigator, document, importScripts, setTimeout, opera */
99

1010
var requirejs, require, define;
11-
(function (global) {
11+
(function (global, setTimeout) {
1212
var req, s, head, baseElement, dataMain, src,
1313
interactiveScript, currentlyAddingScript, mainScript, subPath,
14-
version = '2.2.0',
15-
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
14+
version = '2.3.0',
15+
commentRegExp = /\/\*[\s\S]*?\*\/|([^:"'=]|^)\/\/.*$/mg,
1616
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
1717
jsSuffixRegExp = /\.js$/,
1818
currDirRegExp = /^\.\//,
@@ -36,7 +36,7 @@ var requirejs, require, define;
3636
useInteractive = false;
3737

3838
//Could match something like ')//comment', do not lose the prefix to comment.
39-
function commentReplace(match, multi, multiText, singlePrefix) {
39+
function commentReplace(match, singlePrefix) {
4040
return singlePrefix || '';
4141
}
4242

@@ -2139,4 +2139,4 @@ var requirejs, require, define;
21392139

21402140
//Set up with config info.
21412141
req(cfg);
2142-
}(this));
2142+
}(this, setTimeout));

0 commit comments

Comments
 (0)