MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Update bootstrap-timepicker to 0.3.0

pull/1226/merge
Raphaël Vinot 2016-06-06 17:25:42 +02:00
parent 15ea3bee5b
commit 6de75578c3
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/update_thirdparty.sh
View File

@ -5,10 +5,10 @@ set -e
D3JS='3.5.17'
JQUERY_UI='1.11.4'
JQUERY='2.2.4'
BOOTSTRAP_COLORPICKER='2.0.0'
BOOTSTRAP_DATEPICKER='1.5.1'
BOOTSTRAP_TIMEPICKER='0.2.6'
BOOTSTRAP_TRANSITION='2.3.2'
BOOTSTRAP_COLORPICKER='2.0.0' # Anything higher supports transparent color and requires changes in MISP code
BOOTSTRAP_DATEPICKER='1.5.1' # Need to try 1.6.X
BOOTSTRAP_TIMEPICKER='0.3.0' # Latest version working with Bootstrap 2.X
BOOTSTRAP_TRANSITION='2.3.2' # Latest 2.X bootstrap
CAL_HEATMAP='3.6.0'

28
app/webroot/js/bootstrap-timepicker.js
View File

@ -29,6 +29,7 @@
this.template = options.template;
this.appendWidgetTo = options.appendWidgetTo;
this.showWidgetOnAddonClick = options.showWidgetOnAddonClick;
this.maxHours = options.maxHours-1;
this._init();
};
@ -119,7 +120,7 @@
}
} else {
if (this.hour <= 0) {
this.hour = 23;
this.hour = this.maxHours;
} else {
this.hour--;
}
@ -513,7 +514,7 @@
this.hour = 0;
}
}
if (this.hour === 23) {
if (this.hour === this.maxHours) {
this.hour = 0;
return;
@ -809,8 +810,8 @@
hour = 12;
}
} else {
if (hour >= 24) {
hour = 23;
if (hour > this.maxHours) {
hour = this.maxHours;
} else if (hour < 0) {
hour = 0;
}
@ -1050,7 +1051,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.keyCode === 65) || (e.keyCode === 77) || (e.keyCode === 80) || (e.keyCode === 46) || (e.keyCode === 8) || (e.keyCode >= 46 && e.keyCode <= 57) || (e.keyCode >= 96 && e.keyCode <= 105)) {
this.updateFromWidgetInputs();
}
}
@ -1089,9 +1090,24 @@
showMeridian: true,
template: 'dropdown',
appendWidgetTo: 'body',
showWidgetOnAddonClick: true
showWidgetOnAddonClick: true,
maxHours: 24
};
$.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);