From e41328004b9cabce3fdb36ffe9cdaa24df8725e9 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Wed, 26 Oct 2011 17:29:17 +0200 Subject: datetimepicker fixed --- public/media/js/jquery-ui-timepicker-addon.js | 505 ++++++++++++++++++++------ 1 file changed, 398 insertions(+), 107 deletions(-) (limited to 'public') diff --git a/public/media/js/jquery-ui-timepicker-addon.js b/public/media/js/jquery-ui-timepicker-addon.js index c97bffc..ca506d5 100755 --- a/public/media/js/jquery-ui-timepicker-addon.js +++ b/public/media/js/jquery-ui-timepicker-addon.js @@ -1,8 +1,8 @@ /* * jQuery timepicker addon * By: Trent Richardson [http://trentrichardson.com] -* Version 0.9.5 -* Last Modified: 05/25/2011 +* Version 0.9.7 +* Last Modified: 10/02/2011 * * Copyright 2011 Trent Richardson * Dual licensed under the MIT and GPL licenses. @@ -10,16 +10,17 @@ * http://trentrichardson.com/Impromptu/MIT-LICENSE.txt * * HERES THE CSS: -* .ui-timepicker-div .ui-widget-header{ margin-bottom: 8px; } -* .ui-timepicker-div dl{ text-align: left; } -* .ui-timepicker-div dl dt{ height: 25px; } -* .ui-timepicker-div dl dd{ margin: -25px 10px 10px 65px; } +* .ui-timepicker-div .ui-widget-header { margin-bottom: 8px; } +* .ui-timepicker-div dl { text-align: left; } +* .ui-timepicker-div dl dt { height: 25px; } +* .ui-timepicker-div dl dd { margin: -25px 10px 10px 65px; } * .ui-timepicker-div td { font-size: 90%; } +* .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; } */ (function($) { -$.extend($.ui, { timepicker: { version: "0.9.5" } }); +$.extend($.ui, { timepicker: { version: "0.9.7" } }); /* Time picker manager. Use the singleton instance of this class, $.timepicker, to interact with the time picker. @@ -32,12 +33,16 @@ function Timepicker() { currentText: 'Now', closeText: 'Done', ampm: false, + amNames: ['AM', 'A'], + pmNames: ['PM', 'P'], timeFormat: 'hh:mm tt', + timeSuffix: '', timeOnlyTitle: 'Choose Time', timeText: 'Time', hourText: 'Hour', minuteText: 'Minute', secondText: 'Second', + millisecText: 'Millisecond', timezoneText: 'Time Zone' }; this._defaults = { // Global defaults for all the datetime picker instances @@ -46,34 +51,39 @@ function Timepicker() { showHour: true, showMinute: true, showSecond: false, + showMillisec: false, showTimezone: false, showTime: true, stepHour: 0.05, stepMinute: 0.05, stepSecond: 0.05, + stepMillisec: 0.5, hour: 0, minute: 0, second: 0, + millisec: 0, timezone: '+0000', hourMin: 0, minuteMin: 0, secondMin: 0, + millisecMin: 0, hourMax: 23, minuteMax: 59, secondMax: 59, + millisecMax: 999, minDateTime: null, maxDateTime: null, + onSelect: null, hourGrid: 0, minuteGrid: 0, secondGrid: 0, + millisecGrid: 0, alwaysSetTime: true, separator: ' ', altFieldTimeOnly: true, showTimepicker: true, - timezoneList: ["-1100", "-1000", "-0900", "-0800", "-0700", "-0600", - "-0500", "-0400", "-0300", "-0200", "-0100", "+0000", - "+0100", "+0200", "+0300", "+0400", "+0500", "+0600", - "+0700", "+0800", "+0900", "+1000", "+1100", "+1200"] + timezoneIso8609: false, + timezoneList: null }; $.extend(this._defaults, this.regional['']); } @@ -86,25 +96,26 @@ $.extend(Timepicker.prototype, { hour_slider: null, minute_slider: null, second_slider: null, + millisec_slider: null, timezone_select: null, hour: 0, minute: 0, second: 0, + millisec: 0, timezone: '+0000', hourMinOriginal: null, minuteMinOriginal: null, secondMinOriginal: null, + millisecMinOriginal: null, hourMaxOriginal: null, minuteMaxOriginal: null, secondMaxOriginal: null, + millisecMaxOriginal: null, ampm: '', formattedDate: '', formattedTime: '', formattedDateTime: '', - timezoneList: ["-1100", "-1000", "-0900", "-0800", "-0700", "-0600", - "-0500", "-0400", "-0300", "-0200", "-0100", "+0000", - "+0100", "+0200", "+0300", "+0400", "+0500", "+0600", - "+0700", "+0800", "+0900", "+1000", "+1100", "+1200"], + timezoneList: null, /* Override the default settings for all instances of the time picker. @param settings object - the new settings to use as defaults (anonymous object) @@ -150,10 +161,24 @@ $.extend(Timepicker.prototype, { }, timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker'); }); + tp_inst.amNames = $.map(tp_inst._defaults.amNames, function(val) { return val.toUpperCase() }); + tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function(val) { return val.toUpperCase() }); + + if (tp_inst._defaults.timezoneList === null) { + var timezoneList = []; + for (var i = -11; i <= 12; i++) + timezoneList.push((i >= 0 ? '+' : '-') + ('0' + Math.abs(i).toString()).slice(-2) + '00'); + if (tp_inst._defaults.timezoneIso8609) + timezoneList = $.map(timezoneList, function(val) { + return val == '+0000' ? 'Z' : (val.substring(0, 3) + ':' + val.substring(3)); + }); + tp_inst._defaults.timezoneList = timezoneList; + } tp_inst.hour = tp_inst._defaults.hour; tp_inst.minute = tp_inst._defaults.minute; tp_inst.second = tp_inst._defaults.second; + tp_inst.millisec = tp_inst._defaults.millisec; tp_inst.ampm = ''; tp_inst.$input = $input; @@ -161,7 +186,16 @@ $.extend(Timepicker.prototype, { tp_inst.$altInput = $(o.altField) .css({ cursor: 'pointer' }) .focus(function(){ $input.trigger("focus"); }); - + + if(tp_inst._defaults.minDate==0 || tp_inst._defaults.minDateTime==0) + { + tp_inst._defaults.minDate=new Date(); + } + if(tp_inst._defaults.maxDate==0 || tp_inst._defaults.maxDateTime==0) + { + tp_inst._defaults.maxDate=new Date(); + } + // datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime.. if(tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date) tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime()); @@ -171,7 +205,6 @@ $.extend(Timepicker.prototype, { tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime()); if(tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date) tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime()); - return tp_inst; }, @@ -196,10 +229,12 @@ $.extend(Timepicker.prototype, { .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(/z{1}/ig, '((\\+|-)\\d\\d\\d\\d)?') - .replace(/\s/g, '\\s?') + '$', + .replace(/l{1}/ig, '(\\d?\\d?\\d)') + .replace(/t{1,2}/ig, this._getPatternAmpm()) + .replace(/z{1}/ig, '(z|[-+]\\d\\d:?\\d\\d)?') + .replace(/\s/g, '\\s?') + this._defaults.timeSuffix + '$', order = this._getFormatPositions(), + ampm = '', treg; if (!this.inst) this.inst = $.datepicker._getInst(this.$input[0]); @@ -216,22 +251,50 @@ $.extend(Timepicker.prototype, { treg = timeString.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.t !== -1) { + if (treg[order.t] === undefined || treg[order.t].length === 0) { + ampm = ''; + this.ampm = ''; + } else { + ampm = $.inArray(treg[order.t].toUpperCase(), this.amNames) !== -1 ? 'AM' : 'PM'; + this.ampm = this._defaults[ampm == 'AM' ? 'amNames' : 'pmNames'][0]; + } + } if (order.h !== -1) { - if (this.ampm == 'AM' && treg[order.h] == '12') + if (ampm == 'AM' && treg[order.h] == '12') this.hour = 0; // 12am = 0 hour - else if (this.ampm == 'PM' && treg[order.h] != '12') + else if (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 = Number(treg[order.h]); } if (order.m !== -1) this.minute = Number(treg[order.m]); if (order.s !== -1) this.second = Number(treg[order.s]); - if (order.z !== -1) this.timezone = treg[order.z]; + if (order.l !== -1) this.millisec = Number(treg[order.l]); + if (order.z !== -1 && treg[order.z] !== undefined) { + var tz = treg[order.z].toUpperCase(); + switch (tz.length) { + case 1: // Z + tz = this._defaults.timezoneIso8609 ? 'Z' : '+0000'; + break; + case 5: // +hhmm + if (this._defaults.timezoneIso8609) + tz = tz.substring(1) == '0000' + ? 'Z' + : tz.substring(0, 3) + ':' + tz.substring(3); + break; + case 6: // +hh:mm + if (!this._defaults.timezoneIso8609) + tz = tz == 'Z' || tz.substring(1) == '00:00' + ? '+0000' + : tz.replace(/:/, ''); + else if (tz.substring(1) == '00:00') + tz = 'Z'; + break; + } + this.timezone = tz; + } return true; @@ -239,12 +302,26 @@ $.extend(Timepicker.prototype, { return false; }, + //######################################################################## + // pattern for standard and localized AM/PM markers + //######################################################################## + _getPatternAmpm: function() { + var markers = []; + o = this._defaults; + if (o.amNames) + $.merge(markers, o.amNames); + if (o.pmNames) + $.merge(markers, o.pmNames); + markers = $.map(markers, function(val) { return val.replace(/[.*+?|()\[\]{}\\]/g, '\\$&') }); + return '(' + markers.join('|') + ')?'; + }, + //######################################################################## // 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}|z)/g), - orders = { h: -1, m: -1, s: -1, t: -1, z: -1 }; + var finds = this._defaults.timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|l{1}|t{1,2}|z)/g), + orders = { h: -1, m: -1, s: -1, l: -1, t: -1, z: -1 }; if (finds) for (var i = 0; i < finds.length; i++) @@ -264,9 +341,10 @@ $.extend(Timepicker.prototype, { // Added by Peter Medeiros: // - Figure out what the hour/minute/second max should be based on the step values. // - Example: if stepMinute is 15, then minMax is 45. - hourMax = (o.hourMax - (o.hourMax % o.stepHour)).toFixed(0), - minMax = (o.minuteMax - (o.minuteMax % o.stepMinute)).toFixed(0), - secMax = (o.secondMax - (o.secondMax % o.stepSecond)).toFixed(0), + hourMax = (o.hourMax - ((o.hourMax - o.hourMin) % o.stepHour)).toFixed(0), + minMax = (o.minuteMax - ((o.minuteMax - o.minuteMin) % o.stepMinute)).toFixed(0), + secMax = (o.secondMax - ((o.secondMax - o.secondMin) % o.stepSecond)).toFixed(0), + millisecMax = (o.millisecMax - ((o.millisecMax - o.millisecMin) % o.stepMillisec)).toFixed(0), dp_id = this.inst.id.toString().replace(/([^A-Za-z0-9_])/g, ''); // Prevent displaying twice @@ -283,14 +361,16 @@ $.extend(Timepicker.prototype, { hourGridSize = 0, minuteGridSize = 0, secondGridSize = 0, + millisecGridSize = 0, size; - + + // Hours if (o.showHour && o.hourGrid > 0) { html += '
' + '
' + - '
'; + '
'; - for (var h = o.hourMin; h < hourMax; h += o.hourGrid) { + for (var h = o.hourMin; h <= hourMax; h += parseInt(o.hourGrid,10)) { hourGridSize++; var tmph = (o.ampm && h > 12) ? h-12 : h; if (tmph < 10) tmph = '0' + tmph; @@ -310,13 +390,14 @@ $.extend(Timepicker.prototype, { html += '
' + o.minuteText + '
'; + // Minutes if (o.showMinute && o.minuteGrid > 0) { html += '
' + '
' + - '
'; + '
'; - for (var m = o.minuteMin; m < minMax; m += o.minuteGrid) { + for (var m = o.minuteMin; m <= minMax; m += parseInt(o.minuteGrid,10)) { minuteGridSize++; html += ''; } @@ -326,6 +407,7 @@ $.extend(Timepicker.prototype, { } else html += '
'; + // Seconds html += '
' + o.secondText + '
'; @@ -335,7 +417,7 @@ $.extend(Timepicker.prototype, { ((o.showSecond) ? '' : noDisplay) + '>' + '
' + ((m < 10) ? '0' : '') + m + '
'; - for (var s = o.secondMin; s < secMax; s += o.secondGrid) { + for (var s = o.secondMin; s <= secMax; s += parseInt(o.secondGrid,10)) { secondGridSize++; html += ''; } @@ -344,7 +426,28 @@ $.extend(Timepicker.prototype, { ''; } else html += '
'; - + + // Milliseconds + html += '
' + o.millisecText + '
'; + + if (o.showMillisec && o.millisecGrid > 0) { + html += '
' + + '
' + + '
' + ((s < 10) ? '0' : '') + s + '
'; + + for (var l = o.millisecMin; l <= millisecMax; l += parseInt(o.millisecGrid,10)) { + millisecGridSize++; + html += ''; + } + + html += '
' + ((l < 10) ? '0' : '') + s + '
' + + '
'; + } else html += '
'; + + // Timezone html += '
' + o.timezoneText + '
'; html += '
').find("select"); $.fn.append.apply(this.timezone_select, $.map(o.timezoneList, function(val, idx) { @@ -428,7 +542,7 @@ $.extend(Timepicker.prototype, { var h = $(this).html(); if(o.ampm) { var ap = h.substring(2).toLowerCase(), - aph = parseInt(h.substring(0,2)); + aph = parseInt(h.substring(0,2), 10); if (ap == 'a') { if (aph == 12) h = 0; else h = aph; @@ -486,6 +600,25 @@ $.extend(Timepicker.prototype, { }); } + if (o.showMillisec && o.millisecGrid > 0) { + $tp.find(".ui_tpicker_millisec table").css({ + width: size + "%", + marginLeft: (size / (-2 * millisecGridSize)) + "%", + borderCollapse: 'collapse' + }).find("td").each(function(index) { + $(this).click(function() { + tp_inst.millisec_slider.slider("option", "value", $(this).html()); + tp_inst._onTimeChange(); + tp_inst._onSelectHandler(); + }).css({ + cursor: 'pointer', + width: (100 / millisecGridSize) + '%', + textAlign: 'center', + overflow: 'hidden' + }); + }); + } + var $buttonPanel = $dp.find('.ui-datepicker-buttonpane'); if ($buttonPanel.length) $buttonPanel.before($tp); else $dp.append($tp); @@ -505,11 +638,12 @@ $.extend(Timepicker.prototype, { this.hour_slider.bind('slidestop',onSelectDelegate); this.minute_slider.bind('slidestop',onSelectDelegate); this.second_slider.bind('slidestop',onSelectDelegate); + this.millisec_slider.bind('slidestop',onSelectDelegate); } }, //######################################################################## - // This function tries to limit the ability to go outside the + // This function tries to limit the ability to go outside the // min/max date range //######################################################################## _limitMinMaxDateTime: function(dp_inst, adjustSliders){ @@ -518,14 +652,15 @@ $.extend(Timepicker.prototype, { if(!this._defaults.showTimepicker) return; // No time so nothing to check here - if(this._defaults.minDateTime !== null && dp_date){ - var minDateTime = this._defaults.minDateTime, + if($.datepicker._get(dp_inst, 'minDateTime') !== null && $.datepicker._get(dp_inst, 'minDateTime') !== undefined && dp_date){ + var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'), minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0); - if(this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null){ + if(this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null || this.millisecMinOriginal === null){ this.hourMinOriginal = o.hourMin; this.minuteMinOriginal = o.minuteMin; this.secondMinOriginal = o.secondMin; + this.millisecMinOriginal = o.millisecMin; } if(dp_inst.settings.timeOnly || minDateTimeDate.getTime() == dp_date.getTime()) { @@ -536,29 +671,36 @@ $.extend(Timepicker.prototype, { if (this.minute <= this._defaults.minuteMin) { this.minute = this._defaults.minuteMin; this._defaults.secondMin = minDateTime.getSeconds(); + } else if (this.second <= this._defaults.secondMin){ + this.second = this._defaults.secondMin; + this._defaults.millisecMin = minDateTime.getMilliseconds(); } else { - if(this.second < this._defaults.secondMin) this.second = this._defaults.secondMin; - this._defaults.secondMin = this.secondMinOriginal; + if(this.millisec < this._defaults.millisecMin) + this.millisec = this._defaults.millisecMin; + this._defaults.millisecMin = this.millisecMinOriginal; } } else { this._defaults.minuteMin = this.minuteMinOriginal; this._defaults.secondMin = this.secondMinOriginal; + this._defaults.millisecMin = this.millisecMinOriginal; } }else{ this._defaults.hourMin = this.hourMinOriginal; this._defaults.minuteMin = this.minuteMinOriginal; this._defaults.secondMin = this.secondMinOriginal; + this._defaults.millisecMin = this.millisecMinOriginal; } } - if(this._defaults.maxDateTime !== null && dp_date){ - var maxDateTime = this._defaults.maxDateTime, + if($.datepicker._get(dp_inst, 'maxDateTime') !== null && $.datepicker._get(dp_inst, 'maxDateTime') !== undefined && dp_date){ + var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'), maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0); - + if(this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null){ this.hourMaxOriginal = o.hourMax; this.minuteMaxOriginal = o.minuteMax; this.secondMaxOriginal = o.secondMax; + this.millisecMaxOriginal = o.millisecMax; } if(dp_inst.settings.timeOnly || maxDateTimeDate.getTime() == dp_date.getTime()){ @@ -568,26 +710,41 @@ $.extend(Timepicker.prototype, { this._defaults.minuteMax = maxDateTime.getMinutes(); if (this.minute >= this._defaults.minuteMax) { this.minute = this._defaults.minuteMax; - this._defaults.secondMin = maxDateTime.getSeconds(); + this._defaults.secondMax = maxDateTime.getSeconds(); + } else if (this.second >= this._defaults.secondMax) { + this.second = this._defaults.secondMax; + this._defaults.millisecMax = maxDateTime.getMilliseconds(); } else { - if(this.second > this._defaults.secondMax) this.second = this._defaults.secondMax; - this._defaults.secondMax = this.secondMaxOriginal; + if(this.millisec > this._defaults.millisecMax) this.millisec = this._defaults.millisecMax; + this._defaults.millisecMax = this.millisecMaxOriginal; } } else { this._defaults.minuteMax = this.minuteMaxOriginal; this._defaults.secondMax = this.secondMaxOriginal; + this._defaults.millisecMax = this.millisecMaxOriginal; } }else{ this._defaults.hourMax = this.hourMaxOriginal; this._defaults.minuteMax = this.minuteMaxOriginal; this._defaults.secondMax = this.secondMaxOriginal; + this._defaults.millisecMax = this.millisecMaxOriginal; } } if(adjustSliders !== undefined && adjustSliders === true){ - this.hour_slider.slider("option", { min: this._defaults.hourMin, max: this._defaults.hourMax }).slider('value', this.hour); - this.minute_slider.slider("option", { min: this._defaults.minuteMin, max: this._defaults.minuteMax }).slider('value', this.minute); - this.second_slider.slider("option", { min: this._defaults.secondMin, max: this._defaults.secondMax }).slider('value', this.second); + var hourMax = (this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)).toFixed(0), + minMax = (this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)).toFixed(0), + secMax = (this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)).toFixed(0), + millisecMax = (this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)).toFixed(0); + + if(this.hour_slider) + this.hour_slider.slider("option", { min: this._defaults.hourMin, max: hourMax }).slider('value', this.hour); + if(this.minute_slider) + this.minute_slider.slider("option", { min: this._defaults.minuteMin, max: minMax }).slider('value', this.minute); + if(this.second_slider) + this.second_slider.slider("option", { min: this._defaults.secondMin, max: secMax }).slider('value', this.second); + if(this.millisec_slider) + this.millisec_slider.slider("option", { min: this._defaults.millisecMin, max: millisecMax }).slider('value', this.millisec); } }, @@ -601,30 +758,47 @@ $.extend(Timepicker.prototype, { var hour = (this.hour_slider) ? this.hour_slider.slider('value') : false, minute = (this.minute_slider) ? this.minute_slider.slider('value') : false, second = (this.second_slider) ? this.second_slider.slider('value') : false, - timezone = (this.timezone_select) ? this.timezone_select.val() : false; - + millisec = (this.millisec_slider) ? this.millisec_slider.slider('value') : false, + timezone = (this.timezone_select) ? this.timezone_select.val() : false, + o = this._defaults; + + if (typeof(hour) == 'object') hour = false; + if (typeof(minute) == 'object') minute = false; + if (typeof(second) == 'object') second = false; + if (typeof(millisec) == 'object') millisec = false; + if (typeof(timezone) == 'object') timezone = false; + if (hour !== false) hour = parseInt(hour,10); if (minute !== false) minute = parseInt(minute,10); if (second !== false) second = parseInt(second,10); + if (millisec !== false) millisec = parseInt(millisec,10); + + var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0]; - var ampm = (hour < 12) ? 'AM' : 'PM'; - // If the update was done in the input field, the input field should not be updated. // If the update was done using the sliders, update the input field. - var hasChanged = (hour != this.hour || minute != this.minute || second != this.second || (this.ampm.length > 0 && this.ampm != ampm) || timezone != this.timezone); + var hasChanged = (hour != this.hour || minute != this.minute + || second != this.second || millisec != this.millisec + || (this.ampm.length > 0 + && (hour < 12) != ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) + || timezone != this.timezone); if (hasChanged) { if (hour !== false)this.hour = hour; if (minute !== false) this.minute = minute; if (second !== false) this.second = second; + if (millisec !== false) this.millisec = millisec; if (timezone !== false) this.timezone = timezone; + + if (!this.inst) this.inst = $.datepicker._getInst(this.$input[0]); + this._limitMinMaxDateTime(this.inst, true); } - if (this._defaults.ampm) this.ampm = ampm; + if (o.ampm) this.ampm = ampm; this._formatTime(); - if (this.$timeObj) this.$timeObj.text(this.formattedTime); + if (this.$timeObj) this.$timeObj.text(this.formattedTime + o.timeSuffix); this.timeDefined = true; if (hasChanged) this._updateDateTime(); }, @@ -634,7 +808,7 @@ $.extend(Timepicker.prototype, { // bind to sliders slidestop, and grid click. //######################################################################## _onSelectHandler: function() { - var onSelect = this._defaults['onSelect']; + var onSelect = this._defaults.onSelect; var inputEl = this.$input ? this.$input[0] : null; if (onSelect && inputEl) { onSelect.apply(inputEl, [this.formattedDateTime, this]); @@ -646,37 +820,36 @@ $.extend(Timepicker.prototype, { //######################################################################## _formatTime: function(time, format, ampm) { if (ampm == undefined) ampm = this._defaults.ampm; - time = time || { hour: this.hour, minute: this.minute, second: this.second, ampm: this.ampm, timezone: this.timezone }; - var tmptime = format || this._defaults.timeFormat.toString(); + time = time || { hour: this.hour, minute: this.minute, second: this.second, millisec: this.millisec, ampm: this.ampm, timezone: this.timezone }; + var tmptime = (format || this._defaults.timeFormat).toString(); + var hour = parseInt(time.hour, 10); if (ampm) { - var hour12 = ((time.ampm == 'AM') ? (time.hour) : (time.hour % 12)); - hour12 = (Number(hour12) === 0) ? 12 : hour12; - tmptime = tmptime.toString() - .replace(/hh/g, ((hour12 < 10) ? '0' : '') + hour12) - .replace(/h/g, hour12) - .replace(/mm/g, ((time.minute < 10) ? '0' : '') + time.minute) - .replace(/m/g, time.minute) - .replace(/ss/g, ((time.second < 10) ? '0' : '') + time.second) - .replace(/s/g, time.second) - .replace(/TT/g, time.ampm.toUpperCase()) - .replace(/Tt/g, time.ampm.toUpperCase()) - .replace(/tT/g, time.ampm.toLowerCase()) - .replace(/tt/g, time.ampm.toLowerCase()) - .replace(/T/g, time.ampm.charAt(0).toUpperCase()) - .replace(/t/g, time.ampm.charAt(0).toLowerCase()) - .replace(/z/g, time.timezone); - } else { - tmptime = tmptime.toString() - .replace(/hh/g, ((time.hour < 10) ? '0' : '') + time.hour) - .replace(/h/g, time.hour) - .replace(/mm/g, ((time.minute < 10) ? '0' : '') + time.minute) - .replace(/m/g, time.minute) - .replace(/ss/g, ((time.second < 10) ? '0' : '') + time.second) - .replace(/s/g, time.second) - .replace(/z/g, time.timezone); - tmptime = $.trim(tmptime.replace(/t/gi, '')); + if (!$.inArray(time.ampm.toUpperCase(), this.amNames) !== -1) + hour = hour % 12; + if (hour === 0) + hour = 12; } + tmptime = tmptime.replace(/(?:hh?|mm?|ss?|[tT]{1,2}|[lz])/g, function(match) { + switch (match.toLowerCase()) { + case 'hh': return ('0' + hour).slice(-2); + case 'h': return hour; + case 'mm': return ('0' + time.minute).slice(-2); + case 'm': return time.minute; + case 'ss': return ('0' + time.second).slice(-2); + case 's': return time.second; + case 'l': return ('00' + time.millisec).slice(-3); + case 'z': return time.timezone; + case 't': case 'tt': + if (ampm) { + var _ampm = time.ampm; + if (match.length == 1) + _ampm = _ampm.charAt(0); + return match.charAt(0) == 'T' ? _ampm.toUpperCase() : _ampm.toLowerCase(); + } + return ''; + } + }); if (arguments.length) return tmptime; else this.formattedTime = tmptime; @@ -699,7 +872,7 @@ $.extend(Timepicker.prototype, { if (this._defaults.timeOnly === true) { formattedDateTime = this.formattedTime; } else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) { - formattedDateTime += this._defaults.separator + this.formattedTime; + formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix; } this.formattedDateTime = formattedDateTime; @@ -774,7 +947,7 @@ $.datepicker._selectDate = function (id, dateStr) { tp_inst._limitMinMaxDateTime(inst, true); inst.inline = inst.stay_open = true; //This way the onSelect handler called from calendarpicker get the full dateTime - this._base_selectDate(id, dateStr + tp_inst._defaults.separator + tp_inst.formattedTime); + this._base_selectDate(id, dateStr); inst.inline = inst.stay_open = false; this._notifyChange(inst); this._updateDatepicker(inst); @@ -788,6 +961,16 @@ $.datepicker._selectDate = function (id, dateStr) { //############################################################################################# $.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker; $.datepicker._updateDatepicker = function(inst) { + + // don't popup the datepicker if there is another instance already opened + var input = inst.input[0]; + if($.datepicker._curInst && + $.datepicker._curInst != inst && + $.datepicker._datepickerShowing && + $.datepicker._lastInput != input) { + return; + } + if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) { this._base_updateDatepicker(inst); @@ -799,7 +982,7 @@ $.datepicker._updateDatepicker = function(inst) { }; //####################################################################################### -// third bad hack :/ override datepicker so it allows spaces and colan in the input field +// third bad hack :/ override datepicker so it allows spaces and colon in the input field //####################################################################################### $.datepicker._base_doKeyPress = $.datepicker._doKeyPress; $.datepicker._doKeyPress = function(event) { @@ -809,6 +992,7 @@ $.datepicker._doKeyPress = function(event) { if (tp_inst) { if ($.datepicker._get(inst, 'constrainInput')) { var ampm = tp_inst._defaults.ampm, + dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')), datetimeChars = tp_inst._defaults.timeFormat.toString() .replace(/[hms]/g, '') .replace(/TT/g, ampm ? 'APM' : '') @@ -819,9 +1003,13 @@ $.datepicker._doKeyPress = function(event) { .replace(/t/g, ampm ? 'ap' : '') + " " + tp_inst._defaults.separator + - $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')), + tp_inst._defaults.timeSuffix + + (tp_inst._defaults.showTimezone ? tp_inst._defaults.timezoneList.join('') : '') + + (tp_inst._defaults.amNames.join('')) + + (tp_inst._defaults.pmNames.join('')) + + dateChars, chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode); - return event.ctrlKey || (chr < ' ' || !datetimeChars || datetimeChars.indexOf(chr) > -1); + return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1); } } @@ -855,8 +1043,23 @@ $.datepicker._doKeyUp = function (event) { //####################################################################################### $.datepicker._base_gotoToday = $.datepicker._gotoToday; $.datepicker._gotoToday = function(id) { + var inst = this._getInst($(id)[0]), + $dp = inst.dpDiv; this._base_gotoToday(id); - this._setTime(this._getInst($(id)[0]), new Date()); + var now = new Date(); + var tp_inst = this._get(inst, 'timepicker'); + if (tp_inst._defaults.showTimezone && tp_inst.timezone_select) { + var tzoffset = now.getTimezoneOffset(); // If +0100, returns -60 + var tzsign = tzoffset > 0 ? '-' : '+'; + tzoffset = Math.abs(tzoffset); + var tzmin = tzoffset % 60 + tzoffset = tzsign + ('0' + (tzoffset - tzmin) / 60).slice(-2) + ('0' + tzmin).slice(-2); + if (tp_inst._defaults.timezoneIso8609) + tzoffset = tzoffset.substring(0, 3) + ':' + tzoffset.substring(3); + tp_inst.timezone_select.val(tzoffset); + } + this._setTime(inst, now); + $( '.ui-datepicker-today', $dp).click(); }; //####################################################################################### @@ -893,21 +1096,26 @@ $.datepicker._setTime = function(inst, date) { // calling _setTime with no date sets time to defaults hour = date ? date.getHours() : defaults.hour, minute = date ? date.getMinutes() : defaults.minute, - second = date ? date.getSeconds() : defaults.second; + second = date ? date.getSeconds() : defaults.second, + millisec = date ? date.getMilliseconds() : defaults.millisec; //check if within min/max times.. - if ((hour < defaults.hourMin || hour > defaults.hourMax) || (minute < defaults.minuteMin || minute > defaults.minuteMax) || (second < defaults.secondMin || second > defaults.secondMax)) { + if ((hour < defaults.hourMin || hour > defaults.hourMax) || (minute < defaults.minuteMin || minute > defaults.minuteMax) || (second < defaults.secondMin || second > defaults.secondMax) || (millisec < defaults.millisecMin || millisec > defaults.millisecMax)) { hour = defaults.hourMin; minute = defaults.minuteMin; second = defaults.secondMin; + millisec = defaults.millisecMin; } + tp_inst.hour = hour; + tp_inst.minute = minute; + tp_inst.second = second; + tp_inst.millisec = millisec; + if (tp_inst.hour_slider) tp_inst.hour_slider.slider('value', hour); - else tp_inst.hour = hour; if (tp_inst.minute_slider) tp_inst.minute_slider.slider('value', minute); - else tp_inst.minute = minute; if (tp_inst.second_slider) tp_inst.second_slider.slider('value', second); - else tp_inst.second = second; + if (tp_inst.millisec_slider) tp_inst.millisec_slider.slider('value', millisec); tp_inst._onTimeChange(); tp_inst._updateDateTime(inst); @@ -928,7 +1136,7 @@ $.datepicker._setTimeDatepicker = function(target, date, withDate) { if (typeof date == "string") { tp_inst._parseTime(date, withDate); tp_date = new Date(); - tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second); + tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec); } else tp_date = new Date(date.getTime()); if (tp_date.toString() == 'Invalid Date') tp_date = undefined; @@ -962,12 +1170,94 @@ $.datepicker._getDateDatepicker = function(target, noDefault) { if (tp_inst) { this._setDateFromField(inst, noDefault); var date = this._getDate(inst); - if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second); + if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec); return date; } return this._base_getDateDatepicker(target, noDefault); }; +//####################################################################################### +// override parseDate() because UI 1.8.14 throws an error about "Extra characters" +// An option in datapicker to ignore extra format characters would be nicer. +//####################################################################################### +$.datepicker._base_parseDate = $.datepicker.parseDate; +$.datepicker.parseDate = function(format, value, settings) { + var date; + try { + date = this._base_parseDate(format, value, settings); + } catch (err) { + // Hack! The error message ends with a colon, a space, and + // the "extra" characters. We rely on that instead of + // attempting to perfectly reproduce the parsing algorithm. + date = this._base_parseDate(format, value.substring(0,value.length-(err.length-err.indexOf(':')-2)), settings); + } + return date; +}; + +//####################################################################################### +// override formatDate to set date with time to the input +//####################################################################################### +$.datepicker._base_formatDate=$.datepicker._formatDate; +$.datepicker._formatDate = function(inst, day, month, year){ + var tp_inst = this._get(inst, 'timepicker'); + if(tp_inst) + { + if(day) + var b = this._base_formatDate(inst, day, month, year); + tp_inst._updateDateTime(); + return tp_inst.$input.val(); + } + return this._base_formatDate(inst); +} + +//####################################################################################### +// override options setter to add time to maxDate(Time) and minDate(Time). MaxDate +//####################################################################################### +$.datepicker._base_optionDatepicker = $.datepicker._optionDatepicker; +$.datepicker._optionDatepicker = function(target, name, value) { + var inst = this._getInst(target), + tp_inst = this._get(inst, 'timepicker'); + if (tp_inst) { + var min,max,onselect; + if (typeof name == 'string') { // if min/max was set with the string + if (name==='minDate' || name==='minDateTime' ) + min = value; + else if (name==='maxDate' || name==='maxDateTime') + max = value; + else if (name==='onSelect') + onselect=value; + } else if (typeof name == 'object') { //if min/max was set with the JSON + if(name.minDate) + min = name.minDate; + else if (name.minDateTime) + min = name.minDateTime; + else if (name.maxDate) + max = name.maxDate; + else if (name.maxDateTime) + max = name.maxDateTime; + } + if(min){ //if min was set + if(min==0) + min=new Date(); + else + min= new Date(min); + + tp_inst._defaults.minDate = min; + tp_inst._defaults.minDateTime = min; + } else if (max){ //if max was set + if(max==0) + max=new Date(); + else + max= new Date(max); + tp_inst._defaults.maxDate = max; + tp_inst._defaults.maxDateTime = max; + } + else if (onselect) + tp_inst._defaults.onSelect=onselect; + } + this._base_optionDatepicker(target, name, value); +}; + //####################################################################################### // jQuery extend now ignores nulls! //####################################################################################### @@ -980,6 +1270,7 @@ function extendRemove(target, props) { } $.timepicker = new Timepicker(); // singleton instance -$.timepicker.version = "0.9.5"; +$.timepicker.version = "0.9.7"; })(jQuery); + -- cgit v1.2.3-55-g7522