sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Issue #873 (restaurant hours problem)

Browse Source
This commit is contained in:
Daniel Camargo 2013-03-15 16:45:13 -03:00
parent 0d6ddae93e
commit cc8f79c42f
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
www/assets/js/base.js
View File

@ -141,6 +141,7 @@ App.formatTime = function(time) {
} }
var vals = time.split(':'); var vals = time.split(':');
var pm = false; var pm = false;
vals[0] = new String(vals[0]); vals[0] = new String(vals[0]);
@ -159,31 +160,23 @@ App.formatTime = function(time) {
vals[0] = '00'; vals[0] = '00';
} }
if (!vals[1]) { if (vals[0] > 12) {
vals[0] -= 12;
if (vals[0].match(/pm/i)) { pm = true;
} else{
if (!pm && time.match(/p/i)) {
pm = true; pm = true;
} }
if (vals[0] > 12) { if (pm && time.match(/a/i)) {
vals[0] -= 12; pm = false;
pm = true; }
}
vals[1] = '00';
} else {
if (vals[1].match(/pm/i)) {
pm = true;
}
if (vals[0] > 12) {
vals[0] -= 12;
pm = true;
}
vals[1] = vals[1].replace(/[^0-9]+/,'');
} }
if (!vals[1]) {
vals[1] = '00';
}
vals[1] = vals[1].replace(/[^0-9]+/,'');
vals[0] = new String(vals[0]).replace(/[^0-9]+/,''); vals[0] = new String(vals[0]).replace(/[^0-9]+/,'');
vals[0] = App.pad(vals[0],2); vals[0] = App.pad(vals[0],2);