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

Conflicts: timestring.js
2012-12-30 23:57:19 +00:00 · 2012-12-30 23:57:19 +00:00 · 1945c9dda0
commit 1945c9dda0
parent d3e96cf42c cd715c44f5
1 changed files with 1 additions and 1 deletions
--- a/timestring.js
+++ b/timestring.js
@ -79,7 +79,7 @@
        // split string into groups and get total seconds for each group
        var groups = string
                        .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)

        if (groups !== null) {