projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove debugging code
[roojs1]
/
ux
/
TimePicker.js
diff --git
a/ux/TimePicker.js
b/ux/TimePicker.js
index
48eada7
..
231254e
100644
(file)
--- a/
ux/TimePicker.js
+++ b/
ux/TimePicker.js
@@
-19,6
+19,18
@@
Roo.form.TimePicker = function(config){
}
Roo.form.TimePicker.superclass.constructor.call(this, config);
}
Roo.form.TimePicker.superclass.constructor.call(this, config);
+
+ this.addEvents({
+ /**
+ * @event select
+ * Fires when a date is selected
+ * @param {DatePicker} this
+ * @param {Date} date The selected date
+ */
+ 'select': true,
+
+ });
+
};
Roo.extend(Roo.form.TimePicker , Roo.form.DisplayField , {
};
Roo.extend(Roo.form.TimePicker , Roo.form.DisplayField , {
@@
-50,21
+62,31
@@
Roo.extend(Roo.form.TimePicker , Roo.form.DisplayField , {
this.viewEl.setHeight(this.height);
this.viewEl.setWidth(this.width);
this.viewEl.setHeight(this.height);
this.viewEl.setWidth(this.width);
- var open = this.startHour.split(':').shift() * 1;
- var close = this.endHour.split(':').shift() * 1;
-
+
var paper = this.paper = Raphael(this.viewEl.dom);
paper.setSize(this.width,this.height);
var paper = this.paper = Raphael(this.viewEl.dom);
paper.setSize(this.width,this.height);
- this.renderPaper(open,close);
+
+
+ this.renderPaper(this.startHour,this.endHour);
},
},
- renderPaper : function(
open , close
)
+ renderPaper : function(
startHour , endHour
)
{
// let's create a pie chart...
{
// let's create a pie chart...
+ var open = startHour.split(':').shift() * 1;
+ var close = endHour.split(':').shift() * 1;
+
+ var late_night_close = false;
+ if (close < open || close >= 24) {
+ //endHour = '24:00';
+ close = 24;
+ late_night_close = close;
+ }
+
var paper = this.paper;
this.paper.clear();
var paper = this.paper;
this.paper.clear();
@@
-74,8
+96,7
@@
Roo.extend(Roo.form.TimePicker , Roo.form.DisplayField , {
// say we open for 7 - 19
// say we open for 7 - 19
- open *= 1;
- close *=1;
+
Roo.log([open, close]);
data.push(open);
Roo.log([open, close]);
data.push(open);
@@
-132,7
+153,7
@@
Roo.extend(Roo.form.TimePicker , Roo.form.DisplayField , {
cut: 4 ,
colors : [ '#FEE', '#FCC' ,'#FEE', '#FCC' ] ,
no_sort : true,
cut: 4 ,
colors : [ '#FEE', '#FCC' ,'#FEE', '#FCC' ] ,
no_sort : true,
- start_angle :
90
+ start_angle :
135
}
);
}
);
@@
-150,7
+171,7
@@
Roo.extend(Roo.form.TimePicker , Roo.form.DisplayField , {
for (var i = 0; i < (24/3); i++) {
var angle = ( (360/24) * i * -3 ) -90;
for (var i = 0; i < (24/3); i++) {
var angle = ( (360/24) * i * -3 ) -90;
- var p = outerpie.sector(outerpie.cx, outerpie.cy, 1
20
, angle, angle, false);
+ var p = outerpie.sector(outerpie.cx, outerpie.cy, 1
05
, angle, angle, false);
var innerp = outerpie.sector(outerpie.cx, outerpie.cy, 70, angle, angle, false);
Roo.log([p[4],p[5], (i*3)+':00']);
var innerp = outerpie.sector(outerpie.cx, outerpie.cy, 70, angle, angle, false);
Roo.log([p[4],p[5], (i*3)+':00']);
@@
-218,6
+239,7
@@
Roo.extend(Roo.form.TimePicker , Roo.form.DisplayField , {
var min = ov ? _t.getValue().split(':').pop() : '00';
var ntime = times[this.j] + ':' + min;
_t.setValue(ntime);
var min = ov ? _t.getValue().split(':').pop() : '00';
var ntime = times[this.j] + ':' + min;
_t.setValue(ntime);
+ _t.fireEvent('select', ntime);
if (asector) {
// reset
if (asector) {
// reset
@@
-280,6
+302,8
@@
Roo.extend(Roo.form.TimePicker , Roo.form.DisplayField , {
var hr = ov ? _t.getValue().split(':').shift() : '12';
var ntime = hr + ':' + min;
_t.setValue(ntime);
var hr = ov ? _t.getValue().split(':').shift() : '12';
var ntime = hr + ':' + min;
_t.setValue(ntime);
+ _t.fireEvent('select', ntime);
+
//tdisplay.attr( { text : _t.formatTime(ntime) });
//var ov = _t.getValue();
//tdisplay.attr( { text : _t.formatTime(ntime) });
//var ov = _t.getValue();
@@
-296,7
+320,7
@@
Roo.extend(Roo.form.TimePicker , Roo.form.DisplayField , {
});
});
-
+ this.setValue(this.value);