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

Add ui.isForeign, add guards for Worker tests, and remove Dojo loader filter from test.

Browse Source
This commit is contained in:
John-David Dalton
2014-05-11 16:02:48 -07:00
parent d5c3b258f3
commit 0f8c20c3ab
4 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/index.html
View File

@@ -168,7 +168,7 @@
removeBizarroMethods();
}
// load test scripts
document.write(ui.urlParams.loader == 'none'
document.write((ui.isForeign || ui.urlParams.loader == 'none')
? '<script src="' + ui.buildPath + '"><\/script><script src="test.js"><\/script>'
: '<script data-dojo-config="async:1" src="' + ui.loaderPath + '"><\/script>'
);
@@ -182,7 +182,7 @@
if (window.curl) {
curl.config({ 'apiName': 'require' });
}
if (!window.require) {
if (ui.isForeign || !window.require) {
return;
}
// avoid reporting tests to Sauce Labs when script load errors occur
@@ -256,8 +256,6 @@
function loadModulesAndTests() {
require(getConfig(), ['lodash', 'shimmed', 'underscore'], function(lodash, shimmed, underscore) {
var oldDash = window._;
if (shimmed && shimmed.noConflict) {
shimmedModule = shimmed.noConflict();
shimmedModule.moduleName = 'shimmed';
@@ -270,7 +268,7 @@
lodashModule = lodash;
lodashModule.moduleName = 'lodash';
}
if (oldDash || ui.isModularize) {
if (ui.isModularize) {
window._ = lodash;
}
if (ui.isModularize) {