11/**
2- * @license r.js 2.1.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
2+ * @license r.js 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 */
@@ -20,7 +20,7 @@ var requirejs, require, define, xpcUtil;
2020(function (console, args, readFileFunc) {
2121 var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
2222 nodeDefine, exists, reqMain, loadedOptimizedLib, existsForNode, Cc, Ci,
23- version = '2.1.14 ',
23+ version = '2.1.15 ',
2424 jsSuffixRegExp = /\.js$/,
2525 commandOption = '',
2626 useLibLoaded = {},
@@ -238,7 +238,7 @@ var requirejs, require, define, xpcUtil;
238238 }
239239
240240 /** vim: et:ts=4:sw=4:sts=4
241- * @license RequireJS 2.1.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
241+ * @license RequireJS 2.1.15 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
242242 * Available via the MIT or new BSD license.
243243 * see: http://github.com/jrburke/requirejs for details
244244 */
@@ -251,7 +251,7 @@ var requirejs, require, define, xpcUtil;
251251(function (global) {
252252 var req, s, head, baseElement, dataMain, src,
253253 interactiveScript, currentlyAddingScript, mainScript, subPath,
254- version = '2.1.14 ',
254+ version = '2.1.15 ',
255255 commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
256256 cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
257257 jsSuffixRegExp = /\.js$/,
@@ -22949,7 +22949,7 @@ define('parse', ['./esprimaAdapter', 'lang'], function (esprima, lang) {
2294922949 //Like traverse, but skips if branches that would not be processed
2295022950 //after has application that results in tests of true or false boolean
2295122951 //literal values.
22952- var key, child, result, i, params, param,
22952+ var key, child, result, i, params, param, tempObject,
2295322953 hasHas = options && options.has;
2295422954
2295522955 fnExpScope = fnExpScope || emptyScope;
@@ -22979,23 +22979,23 @@ define('parse', ['./esprimaAdapter', 'lang'], function (esprima, lang) {
2297922979
2298022980 //Build up a "scope" object that informs nested recurse calls if
2298122981 //the define call references an identifier that is likely a UMD
22982- //wrapped function expresion argument.
22982+ //wrapped function expression argument.
2298322983 if (object.type === 'ExpressionStatement' && object.expression &&
2298422984 object.expression.type === 'CallExpression' && object.expression.callee &&
2298522985 object.expression.callee.type === 'FunctionExpression') {
22986- object = object.expression.callee;
22987-
22988- if (object.params && object.params.length) {
22989- params = object.params;
22990- fnExpScope = mixin({}, fnExpScope, true);
22991- for (i = 0; i < params.length; i++) {
22992- param = params[i];
22993- if (param.type === 'Identifier') {
22994- fnExpScope[param.name] = true;
22995- }
22986+ tempObject = object.expression.callee;
22987+
22988+ if (tempObject.params && tempObject.params.length) {
22989+ params = tempObject.params;
22990+ fnExpScope = mixin({}, fnExpScope, true);
22991+ for (i = 0; i < params.length; i++) {
22992+ param = params[i];
22993+ if (param.type === 'Identifier') {
22994+ fnExpScope[param.name] = true;
2299622995 }
2299722996 }
2299822997 }
22998+ }
2299922999
2300023000 for (key in object) {
2300123001 if (object.hasOwnProperty(key)) {
@@ -23014,12 +23014,12 @@ define('parse', ['./esprimaAdapter', 'lang'], function (esprima, lang) {
2301423014 //wrapping.
2301523015 if (typeof result === 'string') {
2301623016 if (hasProp(fnExpScope, result)) {
23017- //Just a plain return, parsing can continue past this
23018- //point .
23019- return;
23017+ //result still in scope, keep jumping out indicating the
23018+ //identifier still in use .
23019+ return result ;
2302023020 }
2302123021
23022- return result ;
23022+ return;
2302323023 }
2302423024 }
2302523025 };
@@ -26539,7 +26539,8 @@ define('build', function (require) {
2653926539 "excludeShallow": true,
2654026540 "insertRequire": true,
2654126541 "stubModules": true,
26542- "deps": true
26542+ "deps": true,
26543+ "mainConfigFile": true
2654326544 };
2654426545
2654526546 for (i = 0; i < ary.length; i++) {
0 commit comments