Skip to content

Commit

Permalink
Move ui.isModularize lower in test-ui.js, tweak timing tests, and u…
Browse files Browse the repository at this point in the history
…pdate lodash-es6 link in readme.
  • Loading branch information
jdalton committed Nov 11, 2013
1 parent 489869c commit 4707014
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Check out our [wiki]([https://github.com/lodash/lodash/wiki/build-differences])

CDN copies are available on [cdnjs](http://cdnjs.com/libraries/lodash.js/) & [jsDelivr](http://www.jsdelivr.com/#!lodash). For smaller file sizes, create [custom builds](http://lodash.com/custom-builds) with only the features needed.

Love modules? We’ve got you covered with [lodash-amd](https://npmjs.org/package/lodash-amd), [lodash-es6](https://npmjs.org/package/lodash-es6), [lodash-node](https://npmjs.org/package/lodash-node), & [npm packages](https://npmjs.org/browse/keyword/lodash-modularized) per method.
Love modules? We’ve got you covered with [lodash-amd](https://npmjs.org/package/lodash-amd), [lodash-es6](https://github.com/lodash/lodash-es6), [lodash-node](https://npmjs.org/package/lodash-node), & [npm packages](https://npmjs.org/browse/keyword/lodash-modularized) per method.

## Dive in

Expand Down
6 changes: 3 additions & 3 deletions test/asset/test-ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@

/*--------------------------------------------------------------------------*/

// 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]);

// initialize controls
addListener(window, 'load', function() {
function eventHandler(event) {
Expand Down Expand Up @@ -168,6 +165,9 @@
'loader': loader
};

// 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]);

// expose `ui`
window.ui = ui;

Expand Down
8 changes: 4 additions & 4 deletions test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6962,7 +6962,7 @@
var throttled = _.throttle(function(value) {
count++;
return value;
}, 32, {});
}, 64, {});

equal(throttled('x'), 'x');
equal(throttled('y'), 'x');
Expand Down Expand Up @@ -7003,12 +7003,12 @@
var withTrailing = _.throttle(function(value) {
withCount++;
return value;
}, 64, { 'trailing': true });
}, 128, { 'trailing': true });

var withoutTrailing = _.throttle(function(value) {
withoutCount++;
return value;
}, 64, { 'trailing': false });
}, 128, { 'trailing': false });

equal(withTrailing('x'), 'x');
equal(withTrailing('y'), 'x');
Expand All @@ -7020,7 +7020,7 @@
equal(withCount, 2);
strictEqual(withoutCount, 1);
QUnit.start();
}, 256);
}, 512);
}
else {
skipTest(6);
Expand Down

0 comments on commit 4707014

Please sign in to comment.