From e0bb0af4e379f8142109f1feda7a851be60cf3ab Mon Sep 17 00:00:00 2001 From: Ibrahim Abdo Date: Mon, 7 Dec 2015 16:56:59 +0200 Subject: [PATCH 1/4] Add minutes step greater than 60 --- js/bootstrap-timepicker.js | 262 +++++++++++++++---------------------- 1 file changed, 104 insertions(+), 158 deletions(-) diff --git a/js/bootstrap-timepicker.js b/js/bootstrap-timepicker.js index 48e75214..1adc3501 100644 --- a/js/bootstrap-timepicker.js +++ b/js/bootstrap-timepicker.js @@ -8,7 +8,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -(function($, window, document) { +(function($, window, document, undefined) { 'use strict'; // TIMEPICKER PUBLIC CLASS DEFINITION @@ -23,27 +23,12 @@ this.modalBackdrop = options.modalBackdrop; this.orientation = options.orientation; this.secondStep = options.secondStep; - this.snapToStep = options.snapToStep; this.showInputs = options.showInputs; this.showMeridian = options.showMeridian; this.showSeconds = options.showSeconds; this.template = options.template; this.appendWidgetTo = options.appendWidgetTo; this.showWidgetOnAddonClick = options.showWidgetOnAddonClick; - this.icons = options.icons; - this.maxHours = options.maxHours; - this.explicitMode = options.explicitMode; // If true 123 = 1:23, 12345 = 1:23:45, else invalid. - - this.handleDocumentClick = function (e) { - var self = e.data.scope; - // This condition was inspired by bootstrap-datepicker. - // The element the timepicker is invoked on is the input but it has a sibling for addon/button. - if (!(self.$element.parent().find(e.target).length || - self.$widget.is(e.target) || - self.$widget.find(e.target).length)) { - self.hideWidget(); - } - }; this._init(); }; @@ -54,8 +39,8 @@ _init: function() { var self = this; - if (this.showWidgetOnAddonClick && (this.$element.parent().hasClass('input-group') && this.$element.parent().hasClass('bootstrap-timepicker'))) { - this.$element.parent('.input-group.bootstrap-timepicker').find('.input-group-addon').on({ + if (this.showWidgetOnAddonClick && (this.$element.parent().hasClass('input-append') || this.$element.parent().hasClass('input-prepend'))) { + this.$element.parent('.input-append, .input-prepend').find('.add-on').on({ 'click.timepicker': $.proxy(this.showWidget, this) }); this.$element.on({ @@ -134,7 +119,7 @@ } } else { if (this.hour <= 0) { - this.hour = this.maxHours - 1; + this.hour = 23; } else { this.hour--; } @@ -147,7 +132,20 @@ if (step) { newVal = this.minute - step; } else { - newVal = this.minute - this.minuteStep; + var minuteStep = this.minuteStep; + if (this.minuteStep > 60) { + var hourStep = Math.floor(this.minuteStep / 60); + minuteStep -= (hourStep * 60); + if (minuteStep == 0) { + minuteStep = 60; + } + + for (var i = 0; i'+ - ''+ + ''+ ' '+ - ''+ + ''+ (this.showSeconds ? ' '+ - '' + '' : '') + (this.showMeridian ? ' '+ - '' + '' : '') + ''+ ''+ @@ -313,16 +294,16 @@ : '') + ''+ ''+ - ''+ + ''+ ''+ - ''+ + ''+ (this.showSeconds ? ' '+ - '' + '' : '') + (this.showMeridian ? ' '+ - '' + '' : '') + ''+ ''; @@ -331,7 +312,7 @@ case 'modal': template = '
'+ '
'+ - '×'+ + '×'+ '

Pick a Time

'+ '
'+ '
'+ @@ -380,7 +361,7 @@ this.$widget.removeClass('open'); } - $(document).off('mousedown.timepicker, touchend.timepicker', this.handleDocumentClick); + $(document).off('mousedown.timepicker, touchend.timepicker'); this.isOpen = false; // show/hide approach taken by datepicker @@ -545,7 +526,7 @@ this.hour = 0; } } - if (this.hour === this.maxHours - 1) { + if (this.hour === 23) { this.hour = 0; return; @@ -559,7 +540,20 @@ if (step) { newVal = this.minute + step; } else { - newVal = this.minute + this.minuteStep - (this.minute % this.minuteStep); + var minuteStep = this.minuteStep; + if (this.minuteStep > 60) { + var hourStep = Math.floor(this.minuteStep / 60); + minuteStep -= (hourStep * 60); + if (minuteStep == 0) { + minuteStep = 60; + } + + for (var i = 0; i 59) { @@ -638,23 +632,6 @@ return false; }, - /** - * Given a segment value like 43, will round and snap the segment - * to the nearest "step", like 45 if step is 15. Segment will - * "overflow" to 0 if it's larger than 59 or would otherwise - * round up to 60. - */ - changeToNearestStep: function (segment, step) { - if (segment % step === 0) { - return segment; - } - if (Math.round((segment % step) / step)) { - return (segment + (step - segment % step)) % 60; - } else { - return segment - segment % step; - } - }, - // This method was adapted from bootstrap-datepicker. place : function() { if (this.isInline) { @@ -663,7 +640,7 @@ var widgetWidth = this.$widget.outerWidth(), widgetHeight = this.$widget.outerHeight(), visualPadding = 10, windowWidth = $(window).width(), windowHeight = $(window).height(), scrollTop = $(window).scrollTop(); - var zIndex = parseInt(this.$element.parents().filter(function() { return $(this).css('z-index') !== 'auto'; }).first().css('z-index'), 10) + 10; + var zIndex = parseInt(this.$element.parents().filter(function() {}).first().css('z-index'), 10) + 10; var offset = this.component ? this.component.parent().offset() : this.$element.offset(); var height = this.component ? this.component.outerHeight(true) : this.$element.outerHeight(false); var width = this.component ? this.component.outerWidth(true) : this.$element.outerWidth(false); @@ -672,7 +649,7 @@ this.$widget.removeClass('timepicker-orient-top timepicker-orient-bottom timepicker-orient-right timepicker-orient-left'); if (this.orientation.x !== 'auto') { - this.$widget.addClass('timepicker-orient-' + this.orientation.x); + this.picker.addClass('datepicker-orient-' + this.orientation.x); if (this.orientation.x === 'right') { left -= widgetWidth - width; } @@ -783,8 +760,7 @@ return; } - var timeMode, - timeArray, + var timeArray, hour, minute, second, @@ -808,38 +784,34 @@ } } } else { - timeMode = ((/a/i).test(time) ? 1 : 0) + ((/p/i).test(time) ? 2 : 0); // 0 = none, 1 = AM, 2 = PM, 3 = BOTH. - if (timeMode > 2) { // If both are present, fail. - this.clear(); - return; + if (time.match(/p/i) !== null) { + meridian = 'PM'; + } else { + meridian = 'AM'; } - timeArray = time.replace(/[^0-9\:]/g, '').split(':'); + time = time.replace(/[^0-9\:]/g, ''); - hour = timeArray[0] ? timeArray[0].toString() : timeArray.toString(); - - if(this.explicitMode && hour.length > 2 && (hour.length % 2) !== 0 ) { - this.clear(); - return; - } + timeArray = time.split(':'); + hour = timeArray[0] ? timeArray[0].toString() : timeArray.toString(); minute = timeArray[1] ? timeArray[1].toString() : ''; second = timeArray[2] ? timeArray[2].toString() : ''; - // adaptive time parsing + // idiot proofing if (hour.length > 4) { - second = hour.slice(-2); - hour = hour.slice(0, -2); + second = hour.substr(4, 2); } - if (hour.length > 2) { - minute = hour.slice(-2); - hour = hour.slice(0, -2); + minute = hour.substr(2, 2); + hour = hour.substr(0, 2); } - if (minute.length > 2) { - second = minute.slice(-2); - minute = minute.slice(0, -2); + second = minute.substr(2, 2); + minute = minute.substr(0, 2); + } + if (second.length > 2) { + second = second.substr(2, 2); } hour = parseInt(hour, 10); @@ -856,53 +828,43 @@ second = 0; } - // Adjust the time based upon unit boundary. - // NOTE: Negatives will never occur due to time.replace() above. - if (second > 59) { - second = 59; + if (this.showMeridian) { + if (hour < 1) { + hour = 1; + } else if (hour > 12) { + hour = 12; + } + } else { + if (hour >= 24) { + hour = 23; + } else if (hour < 0) { + hour = 0; + } + if (hour < 13 && meridian === 'PM') { + hour = hour + 12; + } } - if (minute > 59) { + if (minute < 0) { + minute = 0; + } else if (minute >= 60) { minute = 59; } - if (hour >= this.maxHours) { - // No day/date handling. - hour = this.maxHours - 1; - } - - if (this.showMeridian) { - if (hour > 12) { - // Force PM. - timeMode = 2; - hour -= 12; - } - if (!timeMode) { - timeMode = 1; - } - if (hour === 0) { - hour = 12; // AM or PM, reset to 12. 0 AM = 12 AM. 0 PM = 12 PM, etc. - } - meridian = timeMode === 1 ? 'AM' : 'PM'; - } else if (hour < 12 && timeMode === 2) { - hour += 12; - } else { - if (hour >= this.maxHours) { - hour = this.maxHours - 1; - } else if ((hour < 0) || (hour === 12 && timeMode === 1)){ - hour = 0; + if (this.showSeconds) { + if (isNaN(second)) { + second = 0; + } else if (second < 0) { + second = 0; + } else if (second >= 60) { + second = 59; } } } this.hour = hour; - if (this.snapToStep) { - this.minute = this.changeToNearestStep(minute, this.minuteStep); - this.second = this.changeToNearestStep(second, this.secondStep); - } else { - this.minute = minute; - this.second = second; - } + this.minute = minute; + this.second = second; this.meridian = meridian; this.update(ignoreWidget); @@ -919,7 +881,16 @@ // show/hide approach taken by datepicker this.$widget.appendTo(this.appendWidgetTo); - $(document).on('mousedown.timepicker, touchend.timepicker', {scope: this}, this.handleDocumentClick); + var self = this; + $(document).on('mousedown.timepicker, touchend.timepicker', function (e) { + // This condition was inspired by bootstrap-datepicker. + // The element the timepicker is invoked on is the input but it has a sibling for addon/button. + if (!(self.$element.parent().find(e.target).length || + self.$widget.is(e.target) || + self.$widget.find(e.target).length)) { + self.hideWidget(); + } + }); this.$element.trigger({ 'type': 'show.timepicker', @@ -1054,13 +1025,9 @@ var $input = $(e.target), name = $input.attr('class').replace('bootstrap-timepicker-', ''); - switch (e.which) { + switch (e.keyCode) { case 9: //tab - if (e.shiftKey) { - if (name === 'hour') { - return this.hideWidget(); - } - } else if ((this.showMeridian && name === 'meridian') || (this.showSeconds && name === 'second') || (!this.showMeridian && !this.showSeconds && name === 'minute')) { + if ((this.showMeridian && name === 'meridian') || (this.showSeconds && name === 'second') || (!this.showMeridian && !this.showSeconds && name === 'minute')) { return this.hideWidget(); } break; @@ -1109,7 +1076,7 @@ }, widgetKeyup: function(e) { - if ((e.which === 65) || (e.which === 77) || (e.which === 80) || (e.which === 46) || (e.which === 8) || (e.which >= 48 && e.which <= 57) || (e.which >= 96 && e.which <= 105)) { + if ((e.keyCode === 65) || (e.keyCode === 77) || (e.keyCode === 80) || (e.keyCode === 46) || (e.keyCode === 8) || (e.keyCode >= 46 && e.keyCode <= 57)) { this.updateFromWidgetInputs(); } } @@ -1143,35 +1110,14 @@ modalBackdrop: false, orientation: { x: 'auto', y: 'auto'}, secondStep: 15, - snapToStep: false, showSeconds: false, showInputs: true, showMeridian: true, template: 'dropdown', appendWidgetTo: 'body', - showWidgetOnAddonClick: true, - icons: { - up: 'glyphicon glyphicon-chevron-up', - down: 'glyphicon glyphicon-chevron-down' - }, - maxHours: 24, - explicitMode: false + showWidgetOnAddonClick: true }; $.fn.timepicker.Constructor = Timepicker; - $(document).on( - 'focus.timepicker.data-api click.timepicker.data-api', - '[data-provide="timepicker"]', - function(e){ - var $this = $(this); - if ($this.data('timepicker')) { - return; - } - e.preventDefault(); - // component click requires us to explicitly show it - $this.timepicker(); - } - ); - })(jQuery, window, document); From 54d1cf026133b0b9181e31ac0e2c57efdc28afb8 Mon Sep 17 00:00:00 2001 From: Ibrahim Abdo Date: Mon, 7 Dec 2015 17:04:57 +0200 Subject: [PATCH 2/4] Add minutes step greater than 60 From 534ad9a61f73f2d50391625a585fb6ba0e274c8a Mon Sep 17 00:00:00 2001 From: Ibrahim Abdo Date: Mon, 7 Dec 2015 17:06:19 +0200 Subject: [PATCH 3/4] Add minute step greater than 60 --- js/bootstrap-timepicker.js | 232 +++++++++++++++++++++++++------------ 1 file changed, 156 insertions(+), 76 deletions(-) diff --git a/js/bootstrap-timepicker.js b/js/bootstrap-timepicker.js index 1adc3501..4759b0d4 100644 --- a/js/bootstrap-timepicker.js +++ b/js/bootstrap-timepicker.js @@ -8,7 +8,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -(function($, window, document, undefined) { +(function($, window, document) { 'use strict'; // TIMEPICKER PUBLIC CLASS DEFINITION @@ -23,12 +23,27 @@ this.modalBackdrop = options.modalBackdrop; this.orientation = options.orientation; this.secondStep = options.secondStep; + this.snapToStep = options.snapToStep; this.showInputs = options.showInputs; this.showMeridian = options.showMeridian; this.showSeconds = options.showSeconds; this.template = options.template; this.appendWidgetTo = options.appendWidgetTo; this.showWidgetOnAddonClick = options.showWidgetOnAddonClick; + this.icons = options.icons; + this.maxHours = options.maxHours; + this.explicitMode = options.explicitMode; // If true 123 = 1:23, 12345 = 1:23:45, else invalid. + + this.handleDocumentClick = function (e) { + var self = e.data.scope; + // This condition was inspired by bootstrap-datepicker. + // The element the timepicker is invoked on is the input but it has a sibling for addon/button. + if (!(self.$element.parent().find(e.target).length || + self.$widget.is(e.target) || + self.$widget.find(e.target).length)) { + self.hideWidget(); + } + }; this._init(); }; @@ -39,8 +54,8 @@ _init: function() { var self = this; - if (this.showWidgetOnAddonClick && (this.$element.parent().hasClass('input-append') || this.$element.parent().hasClass('input-prepend'))) { - this.$element.parent('.input-append, .input-prepend').find('.add-on').on({ + if (this.showWidgetOnAddonClick && (this.$element.parent().hasClass('input-group') && this.$element.parent().hasClass('bootstrap-timepicker'))) { + this.$element.parent('.input-group.bootstrap-timepicker').find('.input-group-addon').on({ 'click.timepicker': $.proxy(this.showWidget, this) }); this.$element.on({ @@ -119,7 +134,7 @@ } } else { if (this.hour <= 0) { - this.hour = 23; + this.hour = this.maxHours - 1; } else { this.hour--; } @@ -168,14 +183,30 @@ }, elementKeydown: function(e) { - switch (e.keyCode) { + switch (e.which) { case 9: //tab + if (e.shiftKey) { + if (this.highlightedUnit === 'hour') { + this.hideWidget(); + break; + } + this.highlightPrevUnit(); + } else if ((this.showMeridian && this.highlightedUnit === 'meridian') || (this.showSeconds && this.highlightedUnit === 'second') || (!this.showMeridian && !this.showSeconds && this.highlightedUnit ==='minute')) { + this.hideWidget(); + break; + } else { + this.highlightNextUnit(); + } + e.preventDefault(); + this.updateFromElementVal(); + break; case 27: // escape this.updateFromElementVal(); break; case 37: // left arrow e.preventDefault(); this.highlightPrevUnit(); + this.updateFromElementVal(); break; case 38: // up arrow e.preventDefault(); @@ -202,6 +233,7 @@ case 39: // right arrow e.preventDefault(); this.highlightNextUnit(); + this.updateFromElementVal(); break; case 40: // down arrow e.preventDefault(); @@ -268,16 +300,16 @@ templateContent = ''+ ''+ - ''+ + ''+ ''+ - ''+ + ''+ (this.showSeconds ? ''+ - '' + '' : '') + (this.showMeridian ? ''+ - '' + '' : '') + ''+ ''+ @@ -294,16 +326,16 @@ : '') + ''+ ''+ - ''+ + ''+ ''+ - ''+ + ''+ (this.showSeconds ? ''+ - '' + '' : '') + (this.showMeridian ? ''+ - '' + '' : '') + ''+ '
   
  
'; @@ -312,7 +344,7 @@ case 'modal': template = '
'+ '
'+ - '×'+ + '×'+ '

Pick a Time

'+ '
'+ '
'+ @@ -361,7 +393,7 @@ this.$widget.removeClass('open'); } - $(document).off('mousedown.timepicker, touchend.timepicker'); + $(document).off('mousedown.timepicker, touchend.timepicker', this.handleDocumentClick); this.isOpen = false; // show/hide approach taken by datepicker @@ -526,7 +558,7 @@ this.hour = 0; } } - if (this.hour === 23) { + if (this.hour === this.maxHours - 1) { this.hour = 0; return; @@ -632,6 +664,23 @@ return false; }, + /** + * Given a segment value like 43, will round and snap the segment + * to the nearest "step", like 45 if step is 15. Segment will + * "overflow" to 0 if it's larger than 59 or would otherwise + * round up to 60. + */ + changeToNearestStep: function (segment, step) { + if (segment % step === 0) { + return segment; + } + if (Math.round((segment % step) / step)) { + return (segment + (step - segment % step)) % 60; + } else { + return segment - segment % step; + } + }, + // This method was adapted from bootstrap-datepicker. place : function() { if (this.isInline) { @@ -640,7 +689,7 @@ var widgetWidth = this.$widget.outerWidth(), widgetHeight = this.$widget.outerHeight(), visualPadding = 10, windowWidth = $(window).width(), windowHeight = $(window).height(), scrollTop = $(window).scrollTop(); - var zIndex = parseInt(this.$element.parents().filter(function() {}).first().css('z-index'), 10) + 10; + var zIndex = parseInt(this.$element.parents().filter(function() { return $(this).css('z-index') !== 'auto'; }).first().css('z-index'), 10) + 10; var offset = this.component ? this.component.parent().offset() : this.$element.offset(); var height = this.component ? this.component.outerHeight(true) : this.$element.outerHeight(false); var width = this.component ? this.component.outerWidth(true) : this.$element.outerWidth(false); @@ -649,7 +698,7 @@ this.$widget.removeClass('timepicker-orient-top timepicker-orient-bottom timepicker-orient-right timepicker-orient-left'); if (this.orientation.x !== 'auto') { - this.picker.addClass('datepicker-orient-' + this.orientation.x); + this.$widget.addClass('timepicker-orient-' + this.orientation.x); if (this.orientation.x === 'right') { left -= widgetWidth - width; } @@ -760,7 +809,8 @@ return; } - var timeArray, + var timeMode, + timeArray, hour, minute, second, @@ -784,34 +834,38 @@ } } } else { - if (time.match(/p/i) !== null) { - meridian = 'PM'; - } else { - meridian = 'AM'; + timeMode = ((/a/i).test(time) ? 1 : 0) + ((/p/i).test(time) ? 2 : 0); // 0 = none, 1 = AM, 2 = PM, 3 = BOTH. + if (timeMode > 2) { // If both are present, fail. + this.clear(); + return; } - time = time.replace(/[^0-9\:]/g, ''); - - timeArray = time.split(':'); + timeArray = time.replace(/[^0-9\:]/g, '').split(':'); hour = timeArray[0] ? timeArray[0].toString() : timeArray.toString(); + + if(this.explicitMode && hour.length > 2 && (hour.length % 2) !== 0 ) { + this.clear(); + return; + } + minute = timeArray[1] ? timeArray[1].toString() : ''; second = timeArray[2] ? timeArray[2].toString() : ''; - // idiot proofing + // adaptive time parsing if (hour.length > 4) { - second = hour.substr(4, 2); + second = hour.slice(-2); + hour = hour.slice(0, -2); } + if (hour.length > 2) { - minute = hour.substr(2, 2); - hour = hour.substr(0, 2); + minute = hour.slice(-2); + hour = hour.slice(0, -2); } + if (minute.length > 2) { - second = minute.substr(2, 2); - minute = minute.substr(0, 2); - } - if (second.length > 2) { - second = second.substr(2, 2); + second = minute.slice(-2); + minute = minute.slice(0, -2); } hour = parseInt(hour, 10); @@ -828,43 +882,53 @@ second = 0; } - if (this.showMeridian) { - if (hour < 1) { - hour = 1; - } else if (hour > 12) { - hour = 12; - } - } else { - if (hour >= 24) { - hour = 23; - } else if (hour < 0) { - hour = 0; - } - if (hour < 13 && meridian === 'PM') { - hour = hour + 12; - } + // Adjust the time based upon unit boundary. + // NOTE: Negatives will never occur due to time.replace() above. + if (second > 59) { + second = 59; } - if (minute < 0) { - minute = 0; - } else if (minute >= 60) { + if (minute > 59) { minute = 59; } - if (this.showSeconds) { - if (isNaN(second)) { - second = 0; - } else if (second < 0) { - second = 0; - } else if (second >= 60) { - second = 59; + if (hour >= this.maxHours) { + // No day/date handling. + hour = this.maxHours - 1; + } + + if (this.showMeridian) { + if (hour > 12) { + // Force PM. + timeMode = 2; + hour -= 12; + } + if (!timeMode) { + timeMode = 1; + } + if (hour === 0) { + hour = 12; // AM or PM, reset to 12. 0 AM = 12 AM. 0 PM = 12 PM, etc. + } + meridian = timeMode === 1 ? 'AM' : 'PM'; + } else if (hour < 12 && timeMode === 2) { + hour += 12; + } else { + if (hour >= this.maxHours) { + hour = this.maxHours - 1; + } else if ((hour < 0) || (hour === 12 && timeMode === 1)){ + hour = 0; } } } this.hour = hour; - this.minute = minute; - this.second = second; + if (this.snapToStep) { + this.minute = this.changeToNearestStep(minute, this.minuteStep); + this.second = this.changeToNearestStep(second, this.secondStep); + } else { + this.minute = minute; + this.second = second; + } this.meridian = meridian; this.update(ignoreWidget); @@ -881,16 +945,7 @@ // show/hide approach taken by datepicker this.$widget.appendTo(this.appendWidgetTo); - var self = this; - $(document).on('mousedown.timepicker, touchend.timepicker', function (e) { - // This condition was inspired by bootstrap-datepicker. - // The element the timepicker is invoked on is the input but it has a sibling for addon/button. - if (!(self.$element.parent().find(e.target).length || - self.$widget.is(e.target) || - self.$widget.find(e.target).length)) { - self.hideWidget(); - } - }); + $(document).on('mousedown.timepicker, touchend.timepicker', {scope: this}, this.handleDocumentClick); this.$element.trigger({ 'type': 'show.timepicker', @@ -1025,9 +1080,13 @@ var $input = $(e.target), name = $input.attr('class').replace('bootstrap-timepicker-', ''); - switch (e.keyCode) { + switch (e.which) { case 9: //tab - if ((this.showMeridian && name === 'meridian') || (this.showSeconds && name === 'second') || (!this.showMeridian && !this.showSeconds && name === 'minute')) { + if (e.shiftKey) { + if (name === 'hour') { + return this.hideWidget(); + } + } else if ((this.showMeridian && name === 'meridian') || (this.showSeconds && name === 'second') || (!this.showMeridian && !this.showSeconds && name === 'minute')) { return this.hideWidget(); } break; @@ -1076,7 +1135,7 @@ }, widgetKeyup: function(e) { - if ((e.keyCode === 65) || (e.keyCode === 77) || (e.keyCode === 80) || (e.keyCode === 46) || (e.keyCode === 8) || (e.keyCode >= 46 && e.keyCode <= 57)) { + if ((e.which === 65) || (e.which === 77) || (e.which === 80) || (e.which === 46) || (e.which === 8) || (e.which >= 48 && e.which <= 57) || (e.which >= 96 && e.which <= 105)) { this.updateFromWidgetInputs(); } } @@ -1110,14 +1169,35 @@ modalBackdrop: false, orientation: { x: 'auto', y: 'auto'}, secondStep: 15, + snapToStep: false, showSeconds: false, showInputs: true, showMeridian: true, template: 'dropdown', appendWidgetTo: 'body', - showWidgetOnAddonClick: true + showWidgetOnAddonClick: true, + icons: { + up: 'glyphicon glyphicon-chevron-up', + down: 'glyphicon glyphicon-chevron-down' + }, + maxHours: 24, + explicitMode: false }; $.fn.timepicker.Constructor = Timepicker; + $(document).on( + 'focus.timepicker.data-api click.timepicker.data-api', + '[data-provide="timepicker"]', + function(e){ + var $this = $(this); + if ($this.data('timepicker')) { + return; + } + e.preventDefault(); + // component click requires us to explicitly show it + $this.timepicker(); + } + ); + })(jQuery, window, document); From c518ed67ebd5e46f75970bb165bc82e4f803a643 Mon Sep 17 00:00:00 2001 From: Ibrahim Abdo Date: Wed, 9 Dec 2015 16:39:15 +0200 Subject: [PATCH 4/4] Add minute steps greater than 60 --- js/bootstrap-timepicker.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/js/bootstrap-timepicker.js b/js/bootstrap-timepicker.js index 4759b0d4..a4242016 100644 --- a/js/bootstrap-timepicker.js +++ b/js/bootstrap-timepicker.js @@ -151,11 +151,12 @@ if (this.minuteStep > 60) { var hourStep = Math.floor(this.minuteStep / 60); minuteStep -= (hourStep * 60); - if (minuteStep == 0) { + if (minuteStep === 0) { minuteStep = 60; } - for (var i = 0; i 60) { var hourStep = Math.floor(this.minuteStep / 60); minuteStep -= (hourStep * 60); - if (minuteStep == 0) { + if (minuteStep === 0) { minuteStep = 60; } - for (var i = 0; i