bin/r.js in requirejs-rails-0.9.4 vs bin/r.js in requirejs-rails-0.9.5
- old
+ new
@@ -1,7 +1,7 @@
/**
- * @license r.js 2.1.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
+ * @license r.js 2.1.15 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license.
* see: http://github.com/jrburke/requirejs for details
*/
/*
@@ -18,11 +18,11 @@
var requirejs, require, define, xpcUtil;
(function (console, args, readFileFunc) {
var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
nodeDefine, exists, reqMain, loadedOptimizedLib, existsForNode, Cc, Ci,
- version = '2.1.14',
+ version = '2.1.15',
jsSuffixRegExp = /\.js$/,
commandOption = '',
useLibLoaded = {},
//Used by jslib/rhino/args.js
rhinoArgs = args,
@@ -236,11 +236,11 @@
};
}
}
/** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 2.1.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS 2.1.15 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license.
* see: http://github.com/jrburke/requirejs for details
*/
//Not using strict: uneven strict support in browsers, #392, and causes
//problems with requirejs.exec()/transpiler plugins that may not be strict.
@@ -249,11 +249,11 @@
(function (global) {
var req, s, head, baseElement, dataMain, src,
interactiveScript, currentlyAddingScript, mainScript, subPath,
- version = '2.1.14',
+ version = '2.1.15',
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
jsSuffixRegExp = /\.js$/,
currDirRegExp = /^\.\//,
op = Object.prototype,
@@ -22947,11 +22947,11 @@
*/
parse.recurse = function (object, onMatch, options, fnExpScope) {
//Like traverse, but skips if branches that would not be processed
//after has application that results in tests of true or false boolean
//literal values.
- var key, child, result, i, params, param,
+ var key, child, result, i, params, param, tempObject,
hasHas = options && options.has;
fnExpScope = fnExpScope || emptyScope;
if (!object) {
@@ -22977,27 +22977,27 @@
return result;
}
//Build up a "scope" object that informs nested recurse calls if
//the define call references an identifier that is likely a UMD
- //wrapped function expresion argument.
+ //wrapped function expression argument.
if (object.type === 'ExpressionStatement' && object.expression &&
object.expression.type === 'CallExpression' && object.expression.callee &&
object.expression.callee.type === 'FunctionExpression') {
- object = object.expression.callee;
+ tempObject = object.expression.callee;
- if (object.params && object.params.length) {
- params = object.params;
- fnExpScope = mixin({}, fnExpScope, true);
- for (i = 0; i < params.length; i++) {
- param = params[i];
- if (param.type === 'Identifier') {
- fnExpScope[param.name] = true;
- }
+ if (tempObject.params && tempObject.params.length) {
+ params = tempObject.params;
+ fnExpScope = mixin({}, fnExpScope, true);
+ for (i = 0; i < params.length; i++) {
+ param = params[i];
+ if (param.type === 'Identifier') {
+ fnExpScope[param.name] = true;
}
}
}
+ }
for (key in object) {
if (object.hasOwnProperty(key)) {
child = object[key];
if (typeof child === 'object' && child !== null) {
@@ -23012,16 +23012,16 @@
//Check for an identifier for a factory function identifier being
//passed in as a function expression, indicating a UMD-type of
//wrapping.
if (typeof result === 'string') {
if (hasProp(fnExpScope, result)) {
- //Just a plain return, parsing can continue past this
- //point.
- return;
+ //result still in scope, keep jumping out indicating the
+ //identifier still in use.
+ return result;
}
- return result;
+ return;
}
}
};
/**
@@ -26537,10 +26537,11 @@
"include": true,
"exclude": true,
"excludeShallow": true,
"insertRequire": true,
"stubModules": true,
- "deps": true
+ "deps": true,
+ "mainConfigFile": true
};
for (i = 0; i < ary.length; i++) {
separatorIndex = ary[i].indexOf("=");
if (separatorIndex === -1) {