projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
885a604
)
ux/TimePicker.js
author
Alan Knowles
<alan@roojs.com>
Sun, 26 Aug 2012 10:00:27 +0000
(18:00 +0800)
committer
Alan Knowles
<alan@roojs.com>
Sun, 26 Aug 2012 10:00:27 +0000
(18:00 +0800)
ux/TimePicker.js
patch
|
blob
|
history
diff --git
a/ux/TimePicker.js
b/ux/TimePicker.js
index
a412184
..
e5921d3
100644
(file)
--- 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]);