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

Adjust test for builds without noConflict.

Browse Source
This commit is contained in:
John-David Dalton
2014-12-21 17:28:38 -06:00
parent b42f3a5400
commit 6fcd99c6da
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/index.html
View File

@@ -351,12 +351,12 @@
lodashModule = lodash; lodashModule = lodash;
lodashModule.moduleName = 'lodash'; lodashModule.moduleName = 'lodash';
if (shimmed && shimmed.noConflict) { if (shimmed) {
shimmedModule = shimmed.noConflict(); shimmedModule = shimmed.result(shimmed, 'noConflict') || shimmed;
shimmedModule.moduleName = 'shimmed'; shimmedModule.moduleName = 'shimmed';
} }
if (underscore && underscore.noConflict) { if (underscore) {
underscoreModule = underscore.noConflict(); underscoreModule = underscore.result(underscore, 'noConflict') || underscore;
underscoreModule.moduleName = 'underscore'; underscoreModule.moduleName = 'underscore';
} }
if (ui.isModularize) { if (ui.isModularize) {
@@ -378,7 +378,7 @@
if (window.requirejs) { if (window.requirejs) {
addBizarroMethods(); addBizarroMethods();
require(getConfig(), ['lodash'], function(lodash) { require(getConfig(), ['lodash'], function(lodash) {
lodashBizarro = lodash.noConflict(); lodashBizarro = lodash.result(lodash, 'noConflict') || lodash;
delete requirejs.s.contexts._; delete requirejs.s.contexts._;
removeBizarroMethods(); removeBizarroMethods();