Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

timepicker: add hh:mm output to change event, fix 24 hour normalization

Browse source
This commit is contained in:
Felix Niklas 2015-09-18 17:51:38 +02:00
parent 074da3b01e
commit f22819aaf6
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/assets/javascripts/app/lib/bootstrap/bootstrap-timepicker.js vendored
View file

@ -12,7 +12,8 @@
* - automatically jump from hours to minutes when typing in a number
* - continue stepping from manually input value
* - activate meridian on class 'time--12'
* - normalize output hour to 24-hour clock
* - normalize output to 24-hour clock
* - add hoursAndMinutes
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@ -142,7 +143,7 @@
}
} else {
if (this.hour <= 0) {
this.hour = this.maxHours - 1;
this.hour = this.maxHours;
} else {
this.hour--;
}
@ -950,14 +951,20 @@
// normalize hour to 24-hour clock
var hour = this.hour;
if (this.showMeridian && this.meridian == 'PM') {
hour += 12;
if (this.showMeridian) {
if (this.meridian == 'PM' && hour < 12) {
hour += 12;
}
if (this.meridian == 'AM' && hour == 12) {
hour = 0;
}
}
this.$element.trigger({
'type': 'changeTime.timepicker',
'time': {
'value': this.getTime(),
'hoursAndMinutes': this.pad(hour) +':'+ this.pad(this.minute),
'hours': hour,
'minutes': this.minute,
'seconds': this.second,
@ -966,6 +973,10 @@
});
},
pad: function(val) {
return val.toString().length === 1 ? '0'+ val : val;
},
updateElement: function() {
this.$element.val(this.getTime()).change();
},