Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-08 18:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update vendors.

Browse Source 
Former-commit-id: 4ccda4fafe86514cdb45d191cb743baca9b1baa4
This commit is contained in:
John-David Dalton
2012-08-20 22:43:43 -07:00
parent de6a3c5ab1
commit 24b672b968
7 changed files with 92 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
vendor/requirejs/require.js vendored
View File

@@ -1,5 +1,5 @@
/** vim: et:ts=4:sw=4:sts=4
* @license RequireJS 2.0.5 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
* @license RequireJS 2.0.6 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.0.5',
version = '2.0.6',
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
jsSuffixRegExp = /\.js$/,
@@ -612,7 +612,7 @@ var requirejs, require, define;
});
}
function findCycle(mod, traced) {
function findCycle(mod, traced, processed) {
var id = mod.map.id,
depArray = mod.depMaps,
foundModule;
@@ -635,28 +635,16 @@ var requirejs, require, define;
var depId = depMap.id,
depMod = registry[depId];
if (!depMod) {
if (!depMod || processed[depId] ||
!depMod.inited || !depMod.enabled) {
return;
}
if (!depMod.inited || !depMod.enabled) {
//Dependency is not inited, so this cannot
//be used to determine a cycle.
foundModule = null;
delete traced[id];
return true;
}
//mixin traced to a new object for each dependency, so that
//sibling dependencies in this object to not generate a
//false positive match on a cycle. Ideally an Object.create
//type of prototype delegation would be used here, but
//optimizing for file size vs. execution speed since hopefully
//the trees are small for circular dependency scans relative
//to the full app perf.
return (foundModule = findCycle(depMod, mixin({}, traced)));
return (foundModule = findCycle(depMod, traced, processed));
});
processed[id] = true;
return foundModule;
}
@@ -779,7 +767,7 @@ var requirejs, require, define;
return;
}
var cycleMod = findCycle(mod, {}),
var cycleMod = findCycle(mod, {}, {}),
traced = {};
if (cycleMod) {