8000 2.1.15 · requirejs/requirejs-npm@d034273 · GitHub
[go: up one dir, main page]
Skip to content

Commit d034273

Browse files
jrburkejrburke
committed
2.1.15
1 parent 3be79c9 commit d034273

File tree

3 files changed

+25
-24
lines changed

3 files changed

+25
-24
lines changed

‎requirejs/bin/r.js

Lines changed: 22 additions & 21 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.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
3+
* @license r.js 2.1.15 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.14',
24+
version = '2.1.15',
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.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
242+
* @license RequireJS 2.1.15 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.14',
255+
version = '2.1.15',
256256
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
257257
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
258258
jsSuffixRegExp = /\.js$/,
@@ -22950,7 +22950,7 @@ define('parse', ['./esprimaAdapter', 'lang'], function (esprima, lang) {
2295022950
//Like traverse, but skips if branches that would not be processed
2295122951
//after has application that results in tests of true or false boolean
2295222952
//literal values.
22953-
var key, child, result, i, params, param,
22953+
var key, child, result, i, params, param, tempObject,
2295422954
hasHas = options && options.has;
2295522955

2295622956
fnExpScope = fnExpScope || emptyScope;
@@ -22980,23 +22980,23 @@ define('parse', ['./esprimaAdapter', 'lang'], function (esprima, lang) {
2298022980

2298122981
//Build up a "scope" object that informs nested recurse calls if
2298222982
//the define call references an identifier that is likely a UMD
22983-
//wrapped function expresion argument.
22983+
//wrapped function expression argument.
2298422984
if (object.type === 'ExpressionStatement' && object.expression &&
2298522985
object.expression.type === 'CallExpression' && object.expression.callee &&
2298622986
object.expression.callee.type === 'FunctionExpression') {
22987-
object = object.expression.callee;
22988-
22989-
if (object.params && object.params.length) {
22990-
params = object.params;
22991-
fnExpScope = mixin({}, fnExpScope, true);
22992-
for (i = 0; i < params.length; i++) {
22993-
param = params[i];
22994-
if (param.type === 'Identifier') {
22995-
fnExpScope[param.name] = true;
22996-
}
22987+
tempObject = object.expression.callee;
22988+
22989+
if (tempObject.params && tempObject.params.length) {
22990+
params = tempObject.params;
22991+
fnExpScope = mixin({}, fnExpScope, true);
22992+
for (i = 0; i < params.length; i++) {
22993+
param = params[i];
22994+
if (param.type === 'Identifier') {
22995+
fnExpScope[param.name] = true;
2299722996
}
2299822997
}
2299922998
}
22999+
}
2300023000

2300123001
for (key in object) {
2300223002
if (object.hasOwnProperty(key)) {
@@ -23015,12 +23015,12 @@ define('parse', ['./esprimaAdapter', 'lang'], function (esprima, lang) {
2301523015
//wrapping.
2301623016
if (typeof result === 'string') {
2301723017
if (hasProp(fnExpScope, result)) {
23018-
//Just a plain return, parsing can continue past this
23019-
//point.
23020-
return;
23018+
//result still in scope, keep jumping out indicating the
23019+
//identifier still in use.
23020+
return result;
2302123021
}
2302223022

23023-
return result;
23023+
return;
2302423024
}
2302523025
}
2302623026
};
@@ -26540,7 +26540,8 @@ define('build', function (require) {
2654026540
"excludeShallow": true,
2654126541
"insertRequire": true,
2654226542
"stubModules": true,
26543-
"deps": true
26543+
"deps": true,
26544+
"mainConfigFile": true
2654426545
};
2654526546

2654626547
for (i = 0; i < ary.length; i++) {

‎requirejs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "requirejs",
33
"description": "Node adapter for RequireJS, for loading AMD modules. Includes RequireJS optimizer",
4-
"version": "2.1.14",
4+
"version": "2.1.15",
55
"homepage": "http://github.com/jrburke/r.js",
66
"author": "James Burke <jrburke@gmail.com> (http://github.com/jrburke)",
77
"licenses": [

‎requirejs/require.js

Lines changed: 2 additions & 2 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.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
2+
* @license RequireJS 2.1.15 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.14',
15+
version = '2.1.15',
1616
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
1717
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
1818
jsSuffixRegExp = /\.js$/,

0 commit comments

Comments
 (0)
0