Navy.gif/timestring
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:mike182uk/timestring

Browse Source 
Conflicts:
	timestring.js
This commit is contained in:
Mike Barrett 2012-12-30 23:57:19 +00:00
commit 1945c9dda0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
timestring.js
View File

@ -79,7 +79,7 @@
// split string into groups and get total seconds for each group // split string into groups and get total seconds for each group
var groups = string var groups = string
.toLowerCase() // convert words to lower case .toLowerCase() // convert words to lower case
.replace(/[^\w+-]+/g, '') // remove white space .replace(/[^\.\w+-]+/g, '') // remove white space
.match(/[-+]?[0-9]+[a-z]+/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) { if (groups !== null) {