From 8bcc1d81d29ccced1fff9be96b111534eee76433 Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Wed, 6 Nov 2013 09:27:19 -0800 Subject: [PATCH] Set `loader` to `none` by default in test.html and add default values to perf.html too. --- perf/asset/perf-ui.js | 84 +++++++++++++++++++++---------------------- test/asset/test-ui.js | 82 +++++++++++++++++++++--------------------- 2 files changed, 83 insertions(+), 83 deletions(-) diff --git a/perf/asset/perf-ui.js b/perf/asset/perf-ui.js index 0b448fcba..ecb5b7ce2 100644 --- a/perf/asset/perf-ui.js +++ b/perf/asset/perf-ui.js @@ -34,48 +34,6 @@ /*--------------------------------------------------------------------------*/ - // expose `ui.urlParams` properties - ui.urlParams = { - 'build': build, - 'other': other - }; - - // expose Lo-Dash build file path - ui.buildPath = (function() { - var result; - switch (build) { - case 'lodash-compat': result = 'dist/lodash.compat.min.js'; break; - case 'lodash-legacy': result = 'dist/lodash.legacy.min.js'; break; - case 'lodash-mobile': result = 'dist/lodash.mobile.min.js'; break; - case 'lodash-underscore': result = 'dist/lodash.underscore.min.js'; break; - case 'lodash-custom-dev': result = 'lodash.custom.js'; break; - case 'lodash-custom': result = 'lodash.custom.min.js'; break; - case 'lodash-modern': - case null: result = 'dist/lodash.min.js'; break; - default: return build; - } - return basePath + result; - }()); - - // expose other library file path - ui.otherPath = (function() { - var result; - switch (other) { - case 'lodash-compat': result = 'dist/lodash.compat.min.js'; break; - case 'lodash-legacy': result = 'dist/lodash.legacy.min.js'; break; - case 'lodash-mobile': result = 'dist/lodash.mobile.min.js'; break; - case 'lodash-modern': result = 'dist/lodash.min.js'; break; - case 'lodash-underscore': result = 'dist/lodash.underscore.min.js'; break; - case 'lodash-custom-dev': result = 'lodash.custom.js'; break; - case 'lodash-custom': result = 'lodash.custom.min.js'; break; - case 'underscore-dev': result = 'vendor/underscore/underscore.js'; break; - case 'underscore': - case null: result = 'vendor/underscore/underscore-min.js'; break; - default: return other; - } - return basePath + result; - }()); - // initialize controls addListener(window, 'load', function() { function eventHandler(event) { @@ -166,6 +124,48 @@ addListener(otherList, 'change', eventHandler); }); + // expose Lo-Dash build file path + ui.buildPath = (function() { + var result; + switch (build) { + case 'lodash-compat': result = 'dist/lodash.compat.min.js'; break; + case 'lodash-legacy': result = 'dist/lodash.legacy.min.js'; break; + case 'lodash-mobile': result = 'dist/lodash.mobile.min.js'; break; + case 'lodash-underscore': result = 'dist/lodash.underscore.min.js'; break; + case 'lodash-custom-dev': result = 'lodash.custom.js'; break; + case 'lodash-custom': result = 'lodash.custom.min.js'; break; + case null: build = 'lodash-modern'; + case 'lodash-modern': result = 'dist/lodash.min.js'; break; + default: return build; + } + return basePath + result; + }()); + + // expose other library file path + ui.otherPath = (function() { + var result; + switch (other) { + case 'lodash-compat': result = 'dist/lodash.compat.min.js'; break; + case 'lodash-legacy': result = 'dist/lodash.legacy.min.js'; break; + case 'lodash-mobile': result = 'dist/lodash.mobile.min.js'; break; + case 'lodash-modern': result = 'dist/lodash.min.js'; break; + case 'lodash-underscore': result = 'dist/lodash.underscore.min.js'; break; + case 'lodash-custom-dev': result = 'lodash.custom.js'; break; + case 'lodash-custom': result = 'lodash.custom.min.js'; break; + case 'underscore-dev': result = 'vendor/underscore/underscore.js'; break; + case null: other = 'underscore'; + case 'underscore': result = 'vendor/underscore/underscore-min.js'; break; + default: return other; + } + return basePath + result; + }()); + + // expose `ui.urlParams` properties + ui.urlParams = { + 'build': build, + 'other': other + }; + // expose `ui` window.ui = ui; diff --git a/test/asset/test-ui.js b/test/asset/test-ui.js index 29dd1f9c3..7a4ca6e35 100644 --- a/test/asset/test-ui.js +++ b/test/asset/test-ui.js @@ -34,44 +34,6 @@ /*--------------------------------------------------------------------------*/ - // expose `ui.urlParams` properties - ui.urlParams = { - 'build': build, - 'loader': loader - }; - - // expose Lo-Dash build file path - ui.buildPath = (function() { - var result; - switch (build) { - case 'lodash-compat': result = 'dist/lodash.compat.min.js'; break; - case 'lodash-modern-dev': result = 'dist/lodash.js'; break; - case 'lodash-modern': result = 'dist/lodash.min.js'; break; - case 'lodash-legacy': result = 'dist/lodash.legacy.min.js'; break; - case 'lodash-mobile': result = 'dist/lodash.mobile.min.js'; break; - case 'lodash-underscore': result = 'dist/lodash.underscore.min.js'; break; - case 'lodash-custom-dev': result = 'lodash.custom.js'; break; - case 'lodash-custom': result = 'lodash.custom.min.js'; break; - case 'lodash-compat-dev': - case null: result = 'lodash.js'; break; - default: return build; - } - return basePath + result; - }()); - - // expose module loader file path - ui.loaderPath = (function() { - var result; - switch (loader) { - case 'curl': result = 'vendor/curl/dist/curl-kitchen-sink/curl.js'; break; - case 'dojo': result = 'vendor/dojo/dojo.js'; break; - case 'requirejs': - case null: result = 'vendor/requirejs/require.js'; break; - default: return loader; - } - return basePath + result; - }()); - // used to indicate testing a modularized build ui.isModularize = /\b(?:commonjs|(index|main)\.js|lodash-(?:amd|node)|modularize|npm)\b/.test([location.pathname, location.search, ui.buildPath]); @@ -118,11 +80,11 @@ loaderList.selectedIndex = (function() { switch (loader) { - case 'none': return 0 case 'curl': return 1; case 'dojo': return 2; - case 'requirejs': - case null: return 3; + case 'requirejs': return 3; + case 'none': + case null: return 0; } return -1; }()); @@ -168,6 +130,44 @@ init(); }); + // expose Lo-Dash build file path + ui.buildPath = (function() { + var result; + switch (build) { + case 'lodash-compat': result = 'dist/lodash.compat.min.js'; break; + case 'lodash-modern-dev': result = 'dist/lodash.js'; break; + case 'lodash-modern': result = 'dist/lodash.min.js'; break; + case 'lodash-legacy': result = 'dist/lodash.legacy.min.js'; break; + case 'lodash-mobile': result = 'dist/lodash.mobile.min.js'; break; + case 'lodash-underscore': result = 'dist/lodash.underscore.min.js'; break; + case 'lodash-custom-dev': result = 'lodash.custom.js'; break; + case 'lodash-custom': result = 'lodash.custom.min.js'; break; + case null: build = 'lodash-compat-dev'; + case 'lodash-compat-dev': result = 'lodash.js'; break; + default: return build; + } + return basePath + result; + }()); + + // expose module loader file path + ui.loaderPath = (function() { + var result; + switch (loader) { + case 'curl': result = 'vendor/curl/dist/curl-kitchen-sink/curl.js'; break; + case 'dojo': result = 'vendor/dojo/dojo.js'; break; + case 'requirejs': result = 'vendor/requirejs/require.js'; break; + case null: loader = 'none'; return ''; + default: return loader; + } + return basePath + result; + }()); + + // expose `ui.urlParams` properties + ui.urlParams = { + 'build': build, + 'loader': loader + }; + // expose `ui` window.ui = ui;