fix regular expressions
This commit is contained in:
parent
713022f729
commit
fc1941e2bc
@ -78,13 +78,13 @@
|
||||
// split string into groups and get total seconds for each group
|
||||
var groups = string
|
||||
.replace(/[^\w+-]+/g, '') // remove white space
|
||||
.match(/[-+]?[0-9]*\.?[0-9]+\D/g); // match time groups (digit followed by time unit - i.e 5d 15m = 2 time groups)
|
||||
.match(/[-+]?[0-9]+[a-z]+/g); // match time groups (digit followed by time unit - i.e 5d 15m = 2 time groups)
|
||||
|
||||
if (groups !== null) {
|
||||
for(var group in groups) {
|
||||
var g = groups[group],
|
||||
value = g.match(/[-+]?[0-9]*\.?[0-9]+/g),
|
||||
unit = g.match(new RegExp(unitsRegExp, 'g'));
|
||||
value = g.match(/[0-9]+/g),
|
||||
unit = g.match(/[a-z]+/g);
|
||||
|
||||
totalSeconds += getSeconds(value, unit);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user