flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-30 19:00:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor bugfix...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2016-03-27 20:14:06 +03:00
parent 4b0ee5c182
commit b2fb00adf6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui (gen4)/lib/jli.js
View File

@ -1110,9 +1110,11 @@ Date.str2ms = function(str, dfl){
str = dfl str = dfl
} else { } else {
var val = parseFloat(str)
str = str.trim() str = str.trim()
var val = parseFloat(str) // check if a unit is given...
str = str == val ? dfl : str
} }
var c = /(m(illi)?(-)?s(ec(ond(s)?)?)?)$/i.test(str) ? 1 var c = /(m(illi)?(-)?s(ec(ond(s)?)?)?)$/i.test(str) ? 1
@ -1120,9 +1122,9 @@ Date.str2ms = function(str, dfl){
: /m(in(ute(s)?)?)?$/i.test(str) ? 1000*60 : /m(in(ute(s)?)?)?$/i.test(str) ? 1000*60
: /h(our(s)?)?$/i.test(str) ? 1000*60*60 : /h(our(s)?)?$/i.test(str) ? 1000*60*60
: /d(ay(s)?)?$/i.test(str) ? 1000*60*60*24 : /d(ay(s)?)?$/i.test(str) ? 1000*60*60*24
: Date.str2ms(val, dfl) : null
return val * c return c ? val * c : NaN
} }