From: Alan Knowles Date: Sun, 26 Aug 2012 10:00:27 +0000 (+0800) Subject: ux/TimePicker.js X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=26097f4ddf311a22e256b6ce10f0f9cc2c147751;p=roojs1 ux/TimePicker.js --- diff --git a/ux/TimePicker.js b/ux/TimePicker.js index a4121841e4..e5921d3f21 100644 --- a/ux/TimePicker.js +++ b/ux/TimePicker.js @@ -75,16 +75,12 @@ Roo.extend(Roo.ux.TimePicker , Roo.form.DisplayField , { data.push(1); if (!i) { - times.push( 'midnight' ) - } else if (i == 48) { + times.push( 'midnight') + } else if (i == 12) { times.push( 'noon' ); } else { - var min = ( i % 4) * 15; - min = !min ? ':00' : (':' + min); - var hr = Math.floor(i/4); - var tail = hr < 12 ? 'am' : 'pm'; - hr = hr % 12; - times.push(hr + min + tail); + + times.push(hr ); } colors.push(clr[i % clr.length]);