mirror of
https://github.com/whoisclebs/lodash.git
synced 2026-02-09 02:17:50 +00:00
Update vendors.
Former-commit-id: 1e711564671134b82eed980bccb628af612ae195
This commit is contained in:
John-David Dalton
91
vendor/requirejs/require.js
vendored
91
vendor/requirejs/require.js
vendored
@@ -1,5 +1,5 @@
|
||||
/** vim: et:ts=4:sw=4:sts=4
|
||||
* @license RequireJS 2.1.0 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
|
||||
* @license RequireJS 2.1.1 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
|
||||
* Available via the MIT or new BSD license.
|
||||
* see: http://github.com/jrburke/requirejs for details
|
||||
*/
|
||||
@@ -12,7 +12,7 @@ var requirejs, require, define;
|
||||
(function (global) {
|
||||
var req, s, head, baseElement, dataMain, src,
|
||||
interactiveScript, currentlyAddingScript, mainScript, subPath,
|
||||
version = '2.1.0',
|
||||
version = '2.1.1',
|
||||
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
|
||||
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
|
||||
jsSuffixRegExp = /\.js$/,
|
||||
@@ -100,9 +100,6 @@ var requirejs, require, define;
|
||||
/**
|
||||
* Simple function to mix in properties from source into target,
|
||||
* but only if target does not already have a property of the same name.
|
||||
* This is not robust in IE for transferring methods that match
|
||||
* Object.prototype names, but the uses of mixin here seem unlikely to
|
||||
* trigger a problem related to that.
|
||||
*/
|
||||
function mixin(target, source, force, deepStringMixin) {
|
||||
if (source) {
|
||||
@@ -195,7 +192,9 @@ var requirejs, require, define;
|
||||
baseUrl: './',
|
||||
paths: {},
|
||||
pkgs: {},
|
||||
shim: {}
|
||||
shim: {},
|
||||
map: {},
|
||||
config: {}
|
||||
},
|
||||
registry = {},
|
||||
undefEvents = {},
|
||||
@@ -1167,6 +1166,25 @@ var requirejs, require, define;
|
||||
};
|
||||
}
|
||||
|
||||
function intakeDefines() {
|
||||
var args;
|
||||
|
||||
//Any defined modules in the global queue, intake them now.
|
||||
takeGlobalQueue();
|
||||
|
||||
//Make sure any remaining defQueue items get properly processed.
|
||||
while (defQueue.length) {
|
||||
args = defQueue.shift();
|
||||
if (args[0] === null) {
|
||||
return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1]));
|
||||
} else {
|
||||
//args are id, deps, factory. Should be normalized by the
|
||||
//define() function.
|
||||
callGetModule(args);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
context = {
|
||||
config: config,
|
||||
contextName: contextName,
|
||||
@@ -1194,20 +1212,23 @@ var requirejs, require, define;
|
||||
//they are additive.
|
||||
var pkgs = config.pkgs,
|
||||
shim = config.shim,
|
||||
paths = config.paths,
|
||||
map = config.map;
|
||||
objs = {
|
||||
paths: true,
|
||||
config: true,
|
||||
map: true
|
||||
};
|
||||
|
||||
//Mix in the config values, favoring the new values over
|
||||
//existing ones in context.config.
|
||||
mixin(config, cfg, true);
|
||||
|
||||
//Merge paths.
|
||||
config.paths = mixin(paths, cfg.paths, true);
|
||||
|
||||
//Merge map
|
||||
if (cfg.map) {
|
||||
config.map = mixin(map || {}, cfg.map, true, true);
|
||||
}
|
||||
eachProp(cfg, function (value, prop) {
|
||||
if (objs[prop]) {
|
||||
if (prop === 'map') {
|
||||
mixin(config[prop], value, true, true);
|
||||
} else {
|
||||
mixin(config[prop], value, true);
|
||||
}
|
||||
} else {
|
||||
config[prop] = value;
|
||||
}
|
||||
});
|
||||
|
||||
//Merge shim
|
||||
if (cfg.shim) {
|
||||
@@ -1288,8 +1309,8 @@ var requirejs, require, define;
|
||||
makeRequire: function (relMap, options) {
|
||||
options = options || {};
|
||||
|
||||
function require(deps, callback, errback) {
|
||||
var id, map, requireMod, args;
|
||||
function localRequire(deps, callback, errback) {
|
||||
var id, map, requireMod;
|
||||
|
||||
if (options.enableBuildCallback && callback && isFunction(callback)) {
|
||||
callback.__requireJsBuild = true;
|
||||
@@ -1328,23 +1349,15 @@ var requirejs, require, define;
|
||||
return defined[id];
|
||||
}
|
||||
|
||||
//Any defined modules in the global queue, intake them now.
|
||||
takeGlobalQueue();
|
||||
|
||||
//Make sure any remaining defQueue items get properly processed.
|
||||
while (defQueue.length) {
|
||||
args = defQueue.shift();
|
||||
if (args[0] === null) {
|
||||
return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1]));
|
||||
} else {
|
||||
//args are id, deps, factory. Should be normalized by the
|
||||
//define() function.
|
||||
callGetModule(args);
|
||||
}
|
||||
}
|
||||
//Grab defines waiting in the global queue.
|
||||
intakeDefines();
|
||||
|
||||
//Mark all the dependencies as needing to be loaded.
|
||||
context.nextTick(function () {
|
||||
//Some defines could have been added since the
|
||||
//require call, collect them.
|
||||
intakeDefines();
|
||||
|
||||
requireMod = getModule(makeModuleMap(null, relMap));
|
||||
|
||||
//Store if map config should be applied to this require
|
||||
@@ -1358,10 +1371,10 @@ var requirejs, require, define;
|
||||
checkLoaded();
|
||||
});
|
||||
|
||||
return require;
|
||||
return localRequire;
|
||||
}
|
||||
|
||||
mixin(require, {
|
||||
mixin(localRequire, {
|
||||
isBrowser: isBrowser,
|
||||
|
||||
/**
|
||||
@@ -1394,7 +1407,7 @@ var requirejs, require, define;
|
||||
|
||||
//Only allow undef on top level require calls
|
||||
if (!relMap) {
|
||||
require.undef = function (id) {
|
||||
localRequire.undef = function (id) {
|
||||
//Bind any waiting define() calls to this context,
|
||||
//fix for #408
|
||||
takeGlobalQueue();
|
||||
@@ -1419,7 +1432,7 @@ var requirejs, require, define;
|
||||
};
|
||||
}
|
||||
|
||||
return require;
|
||||
return localRequire;
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user