Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed match regex to support negative numbers #96

Merged
merged 9 commits into from
Nov 29, 2017
Merged

Fixed match regex to support negative numbers #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
93bf167
Fixed match regex to support negative numbers
yoavmmn Sep 13, 2017
7b11ecb
fixed regex to match when using a number before decimal point
yoavmmn Sep 13, 2017
1ce2722
removed package-lock.json
yoavmmn Sep 13, 2017
ab720c8
removed unnecessary dependency
yoavmmn Sep 13, 2017
f049b01
Merge branch 'master' into negative-numbers
yoavmmn Oct 11, 2017
4ed0c58
Merge branch 'master' into negative-numbers
yoavmmn Oct 16, 2017
bc561cd
Merge branch 'master' into negative-numbers
yoavmmn Nov 29, 2017
e4f121e
Merge branch 'master' into negative-numbers
yoavmmn Nov 29, 2017
31b79ef
added support for negative numbers with weeks
yoavmmn Nov 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function parse(str) {
if (str.length > 100) {
return;
}
var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)?$/i.exec(
var match = /^((?:\d+)?\-?\d?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)?$/i.exec(
str
);
if (!match) {
Expand Down
6 changes: 6 additions & 0 deletions tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ describe('ms(string)', function() {
it('should work with numbers starting with .', function() {
expect(ms('.5ms')).to.be(0.5);
});

it('should work with numbers starting with -', function() {
expect(ms('-5')).to.be(-5);
expect(ms('-.5ms')).to.be(-0.5);
expect(ms('-0.5ms')).to.be(-0.5);
});
});

// long strings
Expand Down