diff --git a/perf/perf-ui.js b/perf/perf-ui.js index ac1f07b41..e12c28ff9 100644 --- a/perf/perf-ui.js +++ b/perf/perf-ui.js @@ -34,6 +34,12 @@ /*--------------------------------------------------------------------------*/ + // expose `ui.urlParams` properties + ui.urlParams = { + 'build': build, + 'other': other + }; + // expose Lo-Dash build file path ui.buildPath = (function() { var result; @@ -46,9 +52,9 @@ case 'lodash-custom': result = 'lodash.custom.min.js'; break; case 'lodash-modern': case undefined: result = 'dist/lodash.min.js'; break; - default: result = build; + default: return build; } - return result == build ? result : (basePath + result); + return basePath + result; }()); // expose other library file path @@ -65,9 +71,9 @@ case 'underscore-dev': result = 'vendor/underscore/underscore.js'; break; case 'underscore': case undefined: result = 'vendor/underscore/underscore-min.js'; break; - default: result = other; + default: return other; } - return result == other ? result : (basePath + result); + return basePath + result; }()); // initialize controls diff --git a/test/test-ui.js b/test/test-ui.js index 82430e2a2..423752d0d 100644 --- a/test/test-ui.js +++ b/test/test-ui.js @@ -53,10 +53,11 @@ case 'lodash-custom-dev': result = 'lodash.custom.js'; break; case 'lodash-custom': result = 'lodash.custom.min.js'; break; case 'lodash-compat-dev': + case 'lodash-modularize': case undefined: result = 'lodash.js'; break; - default: result = build; + default: return build; } - return result == build ? result : (basePath + result); + return basePath + result; }()); // expose module loader file path @@ -67,9 +68,9 @@ case 'dojo': result = 'vendor/dojo/dojo.js'; break; case 'requirejs': case undefined: result = 'vendor/requirejs/require.js'; break; - default: result = loader; + default: return loader; } - return result == loader ? result : (basePath + result); + return basePath + result; }()); // initialize controls @@ -105,17 +106,21 @@ case 'lodash-underscore': return 7; case 'lodash-custom-dev': return 8; case 'lodash-custom': return 9; + case 'lodash-compat-dev': + case undefined: return 0; } - return 0; + return -1; }()); loaderList.selectedIndex = (function() { switch (loader) { - case 'none': return 0 - case 'curl': return 1; - case 'dojo': return 2; + case 'none': return 0 + case 'curl': return 1; + case 'dojo': return 2; + case 'requirejs': + case undefined: return 3; } - return 3; + return -1; }()); addEvent(buildList, 'change', eventHandler);