X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=ux%2FTimePicker.js;h=231254e2681226101a46a946527513572b0408d1;hb=0b69a11b1055a6d3a3fd0719bdd58b5a235de0e4;hp=71e9d24960da04520a4d083a4915454a8772fab6;hpb=a8e726d48a6b45c1331ab651da3c1656cf51e1f4;p=roojs1 diff --git a/ux/TimePicker.js b/ux/TimePicker.js index 71e9d24960..231254e268 100644 --- a/ux/TimePicker.js +++ b/ux/TimePicker.js @@ -67,6 +67,8 @@ Roo.extend(Roo.form.TimePicker , Roo.form.DisplayField , { paper.setSize(this.width,this.height); + + this.renderPaper(this.startHour,this.endHour); }, @@ -78,6 +80,14 @@ Roo.extend(Roo.form.TimePicker , Roo.form.DisplayField , { 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(); @@ -229,7 +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); - this.fireEvent('select', ntime); + _t.fireEvent('select', ntime); if (asector) { // reset @@ -292,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); + _t.fireEvent('select', ntime); + //tdisplay.attr( { text : _t.formatTime(ntime) }); //var ov = _t.getValue();