ux/TimePicker.js
authorAlan Knowles <alan@roojs.com>
Sun, 26 Aug 2012 10:00:27 +0000 (18:00 +0800)
committerAlan Knowles <alan@roojs.com>
Sun, 26 Aug 2012 10:00:27 +0000 (18:00 +0800)
ux/TimePicker.js

index a412184..e5921d3 100644 (file)
@@ -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]);