' +
+ function Timepicker() { }
+
+ Timepicker.prototype = {
+ $input: null,
+ $timeObj: null,
+ inst: null,
+ hour_slider: null,
+ minute_slider: null,
+ second_slider: null,
+ hour: 0,
+ minute: 0,
+ second: 0,
+ ampm: '',
+ formattedDate: '',
+ formattedTime: '',
+ formattedDateTime: '',
+ defaults: {
+ holdDatepickerOpen: true,
+ showButtonPanel: true,
+ timeOnly: false,
+ showHour: true,
+ showMinute: true,
+ showSecond: false,
+ showTime: true,
+ //----------------------------
+ stepHour: 0.05,
+ stepMinute: 0.05,
+ stepSecond: 0.05,
+ ampm: false,
+ hour: 0,
+ minute: 0,
+ second: 0,
+ timeFormat: 'hh:mm tt',
+ alwaysSetTime: true
+ //----------------------------
+ },
+
+ //########################################################################
+ // add our sliders to the calendar
+ //########################################################################
+ addTimePicker: function(dp_inst) {
+ var tp_inst = this;
+ var currDT = this.$input.val();
+ var regstr = this.defaults.timeFormat.toString()
+ .replace(/h{1,2}/ig, '(\\d?\\d)')
+ .replace(/m{1,2}/ig, '(\\d?\\d)')
+ .replace(/s{1,2}/ig, '(\\d?\\d)')
+ .replace(/t{1,2}/ig, '(am|pm|a|p)?')
+ .replace(/\s/g, '\\s?') + '$';
+
+ if (!this.defaults.timeOnly) {
+ //the time should come after x number of characters and a space. x = at least the length of text specified by the date format
+ regstr = '.{' + this.defaults.timeFormat.length + ',}\\s+' + regstr;
+ }
+ //--------------------------------------
+
+ var order = this.getFormatPositions();
+ var treg = currDT.match(new RegExp(regstr, 'i'));
+
+ if (treg) {
+ if (order.t !== -1) {
+ this.ampm = ((treg[order.t] == undefined || treg[order.t].length == 0) ? '' : (treg[order.t].charAt(0).toUpperCase() == 'A') ? 'AM' : 'PM').toUpperCase();
+ }
+
+ if (order.h !== -1) {
+ if (this.ampm == 'AM' && treg[order.h] == '12') {
+ this.hour = 0; // 12am = 0 hour
+ } else if (this.ampm == 'PM' && treg[order.h] != '12') {
+ this.hour = (parseFloat(treg[order.h]) + 12).toFixed(0); //12pm = 12 hour, any other pm = hour + 12
+ } else {
+ this.hour = treg[order.h];
+ }
+ }
+
+ if (order.m !== -1) {
+ this.minute = treg[order.m];
+ }
+
+ if (order.s !== -1) {
+ this.second = treg[order.s];
+ }
+ }
+
+ tp_inst.timeDefined = (treg) ? true : false;
+ //---------------------
+
+ // wait for datepicker to create itself.. 60% of the time it works every time..
+ setTimeout(function() {
+ tp_inst.injectTimePicker(dp_inst, tp_inst);
+ }, 10);
+
+ },
+
+ //########################################################################
+ // figure out position of time elements.. cause js cant do named captures
+ //########################################################################
+ getFormatPositions: function() {
+ var finds = this.defaults.timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|t{1,2})/g);
+ var orders = { h: -1, m: -1, s: -1, t: -1 };
+
+ if (finds) {
+ for (var i = 0; i < finds.length; i++) {
+ if (orders[finds[i].toString().charAt(0)] == -1) {
+ orders[finds[i].toString().charAt(0)] = i + 1;
+ }
+ }
+ }
+
+ return orders;
+ },
+
+ //########################################################################
+ // generate and inject html for timepicker into ui datepicker
+ //########################################################################
+ injectTimePicker: function(dp_inst, tp_inst) {
+ var $dp = $('#' + $.datepicker._mainDivId);
+
+ /*
+ * Added by Peter Medeiros
+ * - Figure out what the minute max should be based on the step minute value.
+ * - Get Remainder of 59 / Step Minute and subtract from 59 (59 being total minutes in an hour)
+ */
+ var hourMax = 23 - (23 % tp_inst.defaults.stepHour);
+ var minMax = 59 - (59 % tp_inst.defaults.stepMinute);
+ var secMax = 59 - (59 % tp_inst.defaults.stepSecond);
+
+ /* End Added by Peter Medeiros */
+
+ // Prevent displaying twice
+ if ($dp.find("div#ui-timepicker-div").length === 0) {
+ var html = '' +
+ '
' +
'
' +
- '- Time
' +
+ '- Time
' +
'' +
'- Hour
' +
'' +
@@ -158,87 +159,87 @@
'
' +
'
';
- $tp = $(html);
-
- if (tp_inst.defaults.timeOnly === true) { // if we only want time picker
- $tp.prepend('');
- $dp.find('.ui-datepicker-header, .ui-datepicker-calendar, .ui-datepicker-current').hide();
- }
-
- tp_inst.hour_slider = $tp.find('#ui_tpicker_hour').slider({ orientation: "horizontal", value: tp_inst.hour, min:0, max: hourMax, step: tp_inst.defaults.stepHour, slide: function(event, ui) {
- tp_inst.hour_slider.slider( "option", "value", ui.value );
- tp_inst.onTimeChange(dp_inst, tp_inst);
- } });
- /*
- * Updated by Peter Medeiros
- * - Pass in Event and UI instance into slide function
- */
- tp_inst.minute_slider = $tp.find('#ui_tpicker_minute').slider({ orientation: "horizontal", value: tp_inst.minute, min:0, max: minMax, step: tp_inst.defaults.stepMinute, slide: function(event, ui) {
- tp_inst.minute_slider.slider( "option", "value", ui.value ); // update the global minute slider instance value with the current slider value
- tp_inst.onTimeChange(dp_inst, tp_inst);
- } });
- tp_inst.second_slider = $tp.find('#ui_tpicker_second').slider({ orientation: "horizontal", value: tp_inst.second, min:0, max: secMax, step: tp_inst.defaults.stepSecond, slide: function(event, ui) {
- tp_inst.second_slider.slider( "option", "value", ui.value );
- tp_inst.onTimeChange(dp_inst, tp_inst);
- } });
-
- $dp.find('.ui-datepicker-calendar').after($tp);
- tp_inst.$timeObj = $('#ui_tpicker_time');
-
- if (dp_inst !== null) {
-
- var timeDefined = tp_inst.timeDefined;
-
- tp_inst.onTimeChange(dp_inst, tp_inst);
- tp_inst.timeDefined = timeDefined;
-
- }
- }
- },
-
- //########################################################################
- // when a slider moves..
- // on time change is also called when the time is updated in the text field
- //########################################################################
- onTimeChange: function(dp_inst, tp_inst) {
- var hour = tp_inst.hour_slider.slider('value');
- var minute = tp_inst.minute_slider.slider('value');
- var second = tp_inst.second_slider.slider('value');
- var ampm = (tp_inst.hour < 12) ? 'AM' : 'PM';
-
- var hasChanged = false;
-
- // if the update was done in the input field, this field should not be updated
- // if the update was done using the sliders, update the input field
- if (tp_inst.hour != hour || tp_inst.minute != minute || tp_inst.second != second || (tp_inst.ampm.length > 0 && tp_inst.ampm != ampm)) {
- hasChanged = true;
- }
-
- tp_inst.hour = parseFloat(hour).toFixed(0);
- tp_inst.minute = parseFloat(minute).toFixed(0);
- tp_inst.second = parseFloat(second).toFixed(0);
- tp_inst.ampm = ampm;
-
- tp_inst.formatTime(tp_inst);
-
- tp_inst.$timeObj.text(tp_inst.formattedTime);
-
- if (hasChanged) {
- tp_inst.updateDateTime(dp_inst, tp_inst);
- tp_inst.timeDefined = true;
- }
- },
-
- //########################################################################
- // format the time all pretty...
- //########################################################################
- formatTime: function(inst) {
- var tmptime = inst.defaults.timeFormat.toString();
- var hour12 = ((inst.ampm == 'AM') ? (inst.hour) : (inst.hour % 12));
- hour12 = (hour12 === 0) ? 12 : hour12;
-
- if (inst.defaults.ampm === true) {
- tmptime = tmptime.toString()
+ $tp = $(html);
+
+ if (tp_inst.defaults.timeOnly === true) { // if we only want time picker
+ $tp.prepend('');
+ $dp.find('.ui-datepicker-header, .ui-datepicker-calendar, .ui-datepicker-current').hide();
+ }
+
+ tp_inst.hour_slider = $tp.find('#ui_tpicker_hour').slider({ orientation: "horizontal", value: tp_inst.hour, min:0, max: hourMax, step: tp_inst.defaults.stepHour, slide: function(event, ui) {
+ tp_inst.hour_slider.slider( "option", "value", ui.value );
+ tp_inst.onTimeChange(dp_inst, tp_inst);
+ } });
+ /*
+ * Updated by Peter Medeiros
+ * - Pass in Event and UI instance into slide function
+ */
+ tp_inst.minute_slider = $tp.find('#ui_tpicker_minute').slider({ orientation: "horizontal", value: tp_inst.minute, min:0, max: minMax, step: tp_inst.defaults.stepMinute, slide: function(event, ui) {
+ tp_inst.minute_slider.slider( "option", "value", ui.value ); // update the global minute slider instance value with the current slider value
+ tp_inst.onTimeChange(dp_inst, tp_inst);
+ } });
+ tp_inst.second_slider = $tp.find('#ui_tpicker_second').slider({ orientation: "horizontal", value: tp_inst.second, min:0, max: secMax, step: tp_inst.defaults.stepSecond, slide: function(event, ui) {
+ tp_inst.second_slider.slider( "option", "value", ui.value );
+ tp_inst.onTimeChange(dp_inst, tp_inst);
+ } });
+
+ $dp.find('.ui-datepicker-calendar').after($tp);
+ tp_inst.$timeObj = $('#ui_tpicker_time');
+
+ if (dp_inst !== null) {
+
+ var timeDefined = tp_inst.timeDefined;
+
+ tp_inst.onTimeChange(dp_inst, tp_inst);
+ tp_inst.timeDefined = timeDefined;
+
+ }
+ }
+ },
+
+ //########################################################################
+ // when a slider moves..
+ // on time change is also called when the time is updated in the text field
+ //########################################################################
+ onTimeChange: function(dp_inst, tp_inst) {
+ var hour = tp_inst.hour_slider.slider('value');
+ var minute = tp_inst.minute_slider.slider('value');
+ var second = tp_inst.second_slider.slider('value');
+ var ampm = (tp_inst.hour < 12) ? 'AM' : 'PM';
+
+ var hasChanged = false;
+
+ // if the update was done in the input field, this field should not be updated
+ // if the update was done using the sliders, update the input field
+ if (tp_inst.hour != hour || tp_inst.minute != minute || tp_inst.second != second || (tp_inst.ampm.length > 0 && tp_inst.ampm != ampm)) {
+ hasChanged = true;
+ }
+
+ tp_inst.hour = parseFloat(hour).toFixed(0);
+ tp_inst.minute = parseFloat(minute).toFixed(0);
+ tp_inst.second = parseFloat(second).toFixed(0);
+ tp_inst.ampm = ampm;
+
+ tp_inst.formatTime(tp_inst);
+
+ tp_inst.$timeObj.text(tp_inst.formattedTime);
+
+ if (hasChanged) {
+ tp_inst.updateDateTime(dp_inst, tp_inst);
+ tp_inst.timeDefined = true;
+ }
+ },
+
+ //########################################################################
+ // format the time all pretty...
+ //########################################################################
+ formatTime: function(inst) {
+ var tmptime = inst.defaults.timeFormat.toString();
+ var hour12 = ((inst.ampm == 'AM') ? (inst.hour) : (inst.hour % 12));
+ hour12 = (hour12 === 0) ? 12 : hour12;
+
+ if (inst.defaults.ampm === true) {
+ tmptime = tmptime.toString()
.replace(/hh/g, ((hour12 < 10) ? '0' : '') + hour12)
.replace(/h/g, hour12)
.replace(/mm/g, ((inst.minute < 10) ? '0' : '') + inst.minute)
@@ -249,159 +250,159 @@
.replace(/tt/g, inst.ampm.toLowerCase())
.replace(/T/g, inst.ampm.charAt(0).toUpperCase())
.replace(/t/g, inst.ampm.charAt(0).toLowerCase());
- }
- else {
- tmptime = tmptime.toString()
+ }
+ else {
+ tmptime = tmptime.toString()
.replace(/hh/g, ((inst.hour < 10) ? '0' : '') + inst.hour)
.replace(/h/g, inst.hour)
.replace(/mm/g, ((inst.minute < 10) ? '0' : '') + inst.minute)
.replace(/m/g, inst.minute)
.replace(/ss/g, ((inst.second < 10) ? '0' : '') + inst.second)
.replace(/s/g, inst.second);
- tmptime = $.trim(tmptime.replace(/t/gi, ''));
- }
-
- inst.formattedTime = tmptime;
- return inst.formattedTime;
- },
-
- //########################################################################
- // update our input with the new date time..
- //########################################################################
- updateDateTime: function(dp_inst, tp_inst) {
- var dt = this.$input.datepicker('getDate');
-
- if (dt === null) {
- this.formattedDate = $.datepicker.formatDate($.datepicker._get(dp_inst, 'dateFormat'), new Date(), $.datepicker._getFormatConfig(dp_inst));
- } else {
- this.formattedDate = $.datepicker.formatDate($.datepicker._get(dp_inst, 'dateFormat'), dt, $.datepicker._getFormatConfig(dp_inst));
- }
-
- if (this.defaults.alwaysSetTime) {
- this.formattedDateTime = this.formattedDate + ' ' + this.formattedTime;
- }
- else {
- if (dt === null || !tp_inst.timeDefined || tp_inst.timeDefined === false) {
- this.formattedDateTime = this.formattedDate;
- }
- else {
- this.formattedDateTime = this.formattedDate + ' ' + this.formattedTime;
- }
- }
- //-----------------------------
-
- if (this.defaults.timeOnly == true) {
- this.$input.val(this.formattedTime);
- } else {
- this.$input.val(this.formattedDateTime);
- }
- }
- };
-
- //########################################################################
- // extend timepicker to datepicker
- //########################################################################
- jQuery.fn.datetimepicker = function(o) {
- var tp = new Timepicker();
-
- if (o === undefined) {
- o = {};
- }
-
- tp.defaults = $.extend({}, tp.defaults, o);
-
- tp.defaults = $.extend({}, tp.defaults, {
- beforeShow: function(input, inst) {
- tp.hour = tp.defaults.hour;
- tp.minute = tp.defaults.minute;
- tp.second = tp.defaults.second;
- tp.ampm = '';
- tp.$input = $(input);
- tp.inst = inst;
-
- tp.addTimePicker(inst);
-
- if ($.isFunction(o.beforeShow)) {
- o.beforeShow(input, inst);
- }
- },
- onChangeMonthYear: function(year, month, inst) {
-
- // Update the time as well : this prevents the time from disappearing from the input field.
- tp.updateDateTime(inst, tp);
-
- if ($.isFunction(o.onChangeMonthYear)) {
- o.onChangeMonthYear(year, month, inst);
- }
- },
- onClose: function(dateText, inst) {
- tp.updateDateTime(inst, tp);
-
- if ($.isFunction(o.onClose)) {
- o.onClose(dateText, inst);
- }
- }
- });
-
- $(this).datepicker(tp.defaults);
- };
-
- //########################################################################
- // shorthand just to use timepicker..
- //########################################################################
- jQuery.fn.timepicker = function(o) {
- o = $.extend(o, { timeOnly: true });
-
- $(this).datetimepicker(o);
- };
-
- //########################################################################
- // the bad hack :/ override datepicker so it doesnt close on select
- // inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378
- //########################################################################
- $.datepicker._selectDateOverload = $.datepicker._selectDate;
- $.datepicker._selectDate = function (id, dateStr) {
- var target = $(id);
- var inst = this._getInst(target[0]);
- inst.inline = true;
- $.datepicker._selectDateOverload(id, dateStr);
- inst.inline = false;
- this._notifyChange(inst);
- this._updateDatepicker(inst);
- };
-
- //Change 4 - reduction of code required for override for _updateDatepicker function
- $.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
- //#############################################################################################
- // second bad hack :/ override datepicker so it triggers an event when changing the input field
- //#############################################################################################
- /* Generate the date picker content. */
- $.datepicker._updateDatepicker = function(inst) {
- this._base_updateDatepicker(inst);
- // Reload the time control when changing something in the input text field.
- this._beforeShow(inst.input, inst);
- };
-
- $.datepicker._beforeShow = function(input, inst) {
- var beforeShow = this._get(inst, 'beforeShow');
- if (beforeShow) {
- beforeShow.apply((inst.input ? inst.input[0] : null), [inst.input, inst]);
- }
- };
- //End Change 4 --------------------------------------------------------------------
-
- //#######################################################################################
- // third bad hack :/ override datepicker so it allows spaces and colan in the input field
- //#######################################################################################
- $.datepicker._doKeyPress = function(event) {
- var inst = $.datepicker._getInst(event.target);
- if ($.datepicker._get(inst, 'constrainInput')) {
- var dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat'));
- var chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
- // keyCode == 58 => ":"
- // keyCode == 32 => " "
- return event.ctrlKey || (chr < ' ' || !dateChars || dateChars.indexOf(chr) > -1 || event.keyCode == 58 || event.keyCode == 32);
- }
- };
+ tmptime = $.trim(tmptime.replace(/t/gi, ''));
+ }
+
+ inst.formattedTime = tmptime;
+ return inst.formattedTime;
+ },
+
+ //########################################################################
+ // update our input with the new date time..
+ //########################################################################
+ updateDateTime: function(dp_inst, tp_inst) {
+ var dt = this.$input.datepicker('getDate');
+
+ if (dt === null) {
+ this.formattedDate = $.datepicker.formatDate($.datepicker._get(dp_inst, 'dateFormat'), new Date(), $.datepicker._getFormatConfig(dp_inst));
+ } else {
+ this.formattedDate = $.datepicker.formatDate($.datepicker._get(dp_inst, 'dateFormat'), dt, $.datepicker._getFormatConfig(dp_inst));
+ }
+
+ if (this.defaults.alwaysSetTime) {
+ this.formattedDateTime = this.formattedDate + ' ' + this.formattedTime;
+ }
+ else {
+ if (dt === null || !tp_inst.timeDefined || tp_inst.timeDefined === false) {
+ this.formattedDateTime = this.formattedDate;
+ }
+ else {
+ this.formattedDateTime = this.formattedDate + ' ' + this.formattedTime;
+ }
+ }
+ //-----------------------------
+
+ if (this.defaults.timeOnly == true) {
+ this.$input.val(this.formattedTime);
+ } else {
+ this.$input.val(this.formattedDateTime);
+ }
+ }
+ };
+
+ //########################################################################
+ // extend timepicker to datepicker
+ //########################################################################
+ jQuery.fn.datetimepicker = function(o) {
+ var tp = new Timepicker();
+
+ if (o === undefined) {
+ o = {};
+ }
+
+ tp.defaults = $.extend({}, tp.defaults, o);
+
+ tp.defaults = $.extend({}, tp.defaults, {
+ beforeShow: function(input, inst) {
+ tp.hour = tp.defaults.hour;
+ tp.minute = tp.defaults.minute;
+ tp.second = tp.defaults.second;
+ tp.ampm = '';
+ tp.$input = $(input);
+ tp.inst = inst;
+
+ tp.addTimePicker(inst);
+
+ if ($.isFunction(o.beforeShow)) {
+ o.beforeShow(input, inst);
+ }
+ },
+ onChangeMonthYear: function(year, month, inst) {
+
+ // Update the time as well : this prevents the time from disappearing from the input field.
+ tp.updateDateTime(inst, tp);
+
+ if ($.isFunction(o.onChangeMonthYear)) {
+ o.onChangeMonthYear(year, month, inst);
+ }
+ },
+ onClose: function(dateText, inst) {
+ tp.updateDateTime(inst, tp);
+
+ if ($.isFunction(o.onClose)) {
+ o.onClose(dateText, inst);
+ }
+ }
+ });
+
+ $(this).datepicker(tp.defaults);
+ };
+
+ //########################################################################
+ // shorthand just to use timepicker..
+ //########################################################################
+ jQuery.fn.timepicker = function(o) {
+ o = $.extend(o, { timeOnly: true });
+
+ $(this).datetimepicker(o);
+ };
+
+ //########################################################################
+ // the bad hack :/ override datepicker so it doesnt close on select
+ // inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378
+ //########################################################################
+ $.datepicker._selectDateOverload = $.datepicker._selectDate;
+ $.datepicker._selectDate = function (id, dateStr) {
+ var target = $(id);
+ var inst = this._getInst(target[0]);
+ inst.inline = true;
+ $.datepicker._selectDateOverload(id, dateStr);
+ inst.inline = false;
+ this._notifyChange(inst);
+ this._updateDatepicker(inst);
+ };
+
+ //Change 4 - reduction of code required for override for _updateDatepicker function
+ $.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
+ //#############################################################################################
+ // second bad hack :/ override datepicker so it triggers an event when changing the input field
+ //#############################################################################################
+ /* Generate the date picker content. */
+ $.datepicker._updateDatepicker = function(inst) {
+ this._base_updateDatepicker(inst);
+ // Reload the time control when changing something in the input text field.
+ this._beforeShow(inst.input, inst);
+ };
+
+ $.datepicker._beforeShow = function(input, inst) {
+ var beforeShow = this._get(inst, 'beforeShow');
+ if (beforeShow) {
+ beforeShow.apply((inst.input ? inst.input[0] : null), [inst.input, inst]);
+ }
+ };
+ //End Change 4 --------------------------------------------------------------------
+
+ //#######################################################################################
+ // third bad hack :/ override datepicker so it allows spaces and colan in the input field
+ //#######################################################################################
+ $.datepicker._doKeyPress = function(event) {
+ var inst = $.datepicker._getInst(event.target);
+ if ($.datepicker._get(inst, 'constrainInput')) {
+ var dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat'));
+ var chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
+ // keyCode == 58 => ":"
+ // keyCode == 32 => " "
+ return event.ctrlKey || (chr < ' ' || !dateChars || dateChars.indexOf(chr) > -1 || event.keyCode == 58 || event.keyCode == 32);
+ }
+ };
})(jQuery);
From c304838d4be24a46f34a1c0b98fc281852b16749 Mon Sep 17 00:00:00 2001
From: Jeff Terrell
Date: Tue, 31 Aug 2010 14:17:24 -0400
Subject: [PATCH 07/12] conform to jQueryUI style guidelines*, part 2
* http://jqueryui.com/docs/Developer_Guide#Coding_Style
1. put comments before the line they describe
2. space after "//"
3. removed "//-------" comments
---
jquery-ui-timepicker-addon.js | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index 3b96e37..58b2ad0 100644
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -39,7 +39,6 @@
showMinute: true,
showSecond: false,
showTime: true,
- //----------------------------
stepHour: 0.05,
stepMinute: 0.05,
stepSecond: 0.05,
@@ -49,7 +48,6 @@
second: 0,
timeFormat: 'hh:mm tt',
alwaysSetTime: true
- //----------------------------
},
//########################################################################
@@ -69,7 +67,6 @@
//the time should come after x number of characters and a space. x = at least the length of text specified by the date format
regstr = '.{' + this.defaults.timeFormat.length + ',}\\s+' + regstr;
}
- //--------------------------------------
var order = this.getFormatPositions();
var treg = currDT.match(new RegExp(regstr, 'i'));
@@ -81,9 +78,11 @@
if (order.h !== -1) {
if (this.ampm == 'AM' && treg[order.h] == '12') {
- this.hour = 0; // 12am = 0 hour
+ // 12am = 0 hour
+ this.hour = 0;
} else if (this.ampm == 'PM' && treg[order.h] != '12') {
- this.hour = (parseFloat(treg[order.h]) + 12).toFixed(0); //12pm = 12 hour, any other pm = hour + 12
+ // 12pm = 12 hour, any other pm = hour + 12
+ this.hour = (parseFloat(treg[order.h]) + 12).toFixed(0);
} else {
this.hour = treg[order.h];
}
@@ -99,7 +98,6 @@
}
tp_inst.timeDefined = (treg) ? true : false;
- //---------------------
// wait for datepicker to create itself.. 60% of the time it works every time..
setTimeout(function() {
@@ -161,7 +159,8 @@
$tp = $(html);
- if (tp_inst.defaults.timeOnly === true) { // if we only want time picker
+ // if we only want time picker...
+ if (tp_inst.defaults.timeOnly === true) {
$tp.prepend('');
$dp.find('.ui-datepicker-header, .ui-datepicker-calendar, .ui-datepicker-current').hide();
}
@@ -175,7 +174,8 @@
* - Pass in Event and UI instance into slide function
*/
tp_inst.minute_slider = $tp.find('#ui_tpicker_minute').slider({ orientation: "horizontal", value: tp_inst.minute, min:0, max: minMax, step: tp_inst.defaults.stepMinute, slide: function(event, ui) {
- tp_inst.minute_slider.slider( "option", "value", ui.value ); // update the global minute slider instance value with the current slider value
+ // update the global minute slider instance value with the current slider value
+ tp_inst.minute_slider.slider( "option", "value", ui.value );
tp_inst.onTimeChange(dp_inst, tp_inst);
} });
tp_inst.second_slider = $tp.find('#ui_tpicker_second').slider({ orientation: "horizontal", value: tp_inst.second, min:0, max: secMax, step: tp_inst.defaults.stepSecond, slide: function(event, ui) {
@@ -289,7 +289,6 @@
this.formattedDateTime = this.formattedDate + ' ' + this.formattedTime;
}
}
- //-----------------------------
if (this.defaults.timeOnly == true) {
this.$input.val(this.formattedTime);
@@ -371,7 +370,7 @@
this._updateDatepicker(inst);
};
- //Change 4 - reduction of code required for override for _updateDatepicker function
+ // Change 4 - reduction of code required for override for _updateDatepicker function
$.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
//#############################################################################################
// second bad hack :/ override datepicker so it triggers an event when changing the input field
From 8ea17480260d881bf27943db9c3c0132df68ac5a Mon Sep 17 00:00:00 2001
From: Jeff Terrell
Date: Tue, 31 Aug 2010 14:19:22 -0400
Subject: [PATCH 08/12] ignore temporary development files
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
create mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3268211
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.*.sw?
From bc362fb14c0d9de70a4046ad4127153b84b1aae4 Mon Sep 17 00:00:00 2001
From: Jeff Terrell
Date: Tue, 31 Aug 2010 15:08:01 -0400
Subject: [PATCH 09/12] per AMH*, made code more friendly to minification
* Missed two places where Andrew Montgomery-Hurrell (Github user
darkliquid) changed a '==' to a '==='.
http://github.com/darkliquid/jQuery-Timepicker-Addon/commit/0cc3c4cc3cc3c28a
---
jquery-ui-timepicker-addon.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index 58b2ad0..52ad47a 100644
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -73,7 +73,7 @@
if (treg) {
if (order.t !== -1) {
- this.ampm = ((treg[order.t] == undefined || treg[order.t].length == 0) ? '' : (treg[order.t].charAt(0).toUpperCase() == 'A') ? 'AM' : 'PM').toUpperCase();
+ this.ampm = ((treg[order.t] === undefined || treg[order.t].length === 0) ? '' : (treg[order.t].charAt(0).toUpperCase() == 'A') ? 'AM' : 'PM').toUpperCase();
}
if (order.h !== -1) {
From 9566239ce0c273f851b3b80f34ed7db2e3f8f156 Mon Sep 17 00:00:00 2001
From: Jeff Terrell
Date: Tue, 31 Aug 2010 15:20:50 -0400
Subject: [PATCH 10/12] style issues
- improve consistency and readability
---
jquery-ui-timepicker-addon.js | 97 +++++++++++++++++++----------------
1 file changed, 53 insertions(+), 44 deletions(-)
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index 52ad47a..9ed709f 100644
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -31,6 +31,7 @@
formattedDate: '',
formattedTime: '',
formattedDateTime: '',
+
defaults: {
holdDatepickerOpen: true,
showButtonPanel: true,
@@ -138,25 +139,21 @@
var hourMax = 23 - (23 % tp_inst.defaults.stepHour);
var minMax = 59 - (59 % tp_inst.defaults.stepMinute);
var secMax = 59 - (59 % tp_inst.defaults.stepSecond);
-
/* End Added by Peter Medeiros */
// Prevent displaying twice
if ($dp.find("div#ui-timepicker-div").length === 0) {
var html = '' +
- '' +
- '
' +
- '- Time
' +
- '' +
- '- Hour
' +
- '' +
- '- Minute
' +
- '' +
- '- Second
' +
- '' +
- '
' +
- '
' +
+ '- Time
' +
+ '' +
+ '- Hour
' +
+ '' +
+ '- Minute
' +
+ '' +
+ '- Second
' +
+ '' +
+ '
' +
- '- Time
' +
- '' +
- '- Hour
' +
- '' +
- '- Minute
' +
- '' +
- '- Second
' +
- '' +
+ '- Time
' +
+ '' +
+ '- Hour
' +
+ '' +
+ '- Minute
' +
+ '' +
+ '- Second
' +
+ '' +
'
' +
- '
' +
- '- Time
' +
- '' +
- '- Hour
' +
- '' +
- '- Minute
' +
- '' +
- '- Second
' +
- '' +
- '
' +
- '
' +
+ '
' +
+ '- Time
' +
+ '' +
+ '- Hour
' +
+ '' +
+ '- Minute
' +
+ '' +
+ '- Second
' +
+ '' +
+ '
' +
+ '