diff --git a/js/functions.js b/js/functions.js
index d1c554436c..11e264e71a 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -150,13 +150,15 @@ function PMA_addDatepicker($this_element, options)
showOn: 'button',
buttonImage: themeCalendarImage, // defined in js/messages.php
buttonImageOnly: true,
- duration: '',
- time24h: true,
stepMinutes: 1,
stepHours: 1,
- showTime: showTimeOption,
+ showSecond: true,
+ showTimepicker: showTimeOption,
+ showButtonPanel: false,
dateFormat: 'yy-mm-dd', // yy means year with four digits
- altTimeField: '',
+ timeFormat: 'hh:mm:ss',
+ altFieldTimeOnly: false,
+ showAnim: '',
beforeShow: function(input, inst) {
// Remember that we came from the datepicker; this is used
// in tbl_change.js by verificationsAfterFieldChange()
@@ -166,11 +168,10 @@ function PMA_addDatepicker($this_element, options)
setTimeout(function() {
$('#ui-timepicker-div').css('z-index',$('#ui-datepicker-div').css('z-index'))
},0);
- },
- constrainInput: false
+ }
};
- $this_element.datepicker($.extend(defaultOptions, options));
+ $this_element.datetimepicker($.extend(defaultOptions, options));
}
/**
@@ -611,7 +612,7 @@ $(document).ready(function() {
var $tr = $(this);
// make the table unselectable (to prevent default highlighting when shift+click)
- $tr.parents('table').noSelect();
+ //$tr.parents('table').noSelect();
if (!e.shiftKey || last_clicked_row == -1) {
// usual click
@@ -642,6 +643,7 @@ $(document).ready(function() {
last_shift_clicked_row = -1;
} else {
// handle the shift click
+ PMA_clearSelection();
var start, end;
// clear last shift click result
@@ -3205,3 +3207,16 @@ $(document).ready(function() {
return true;
});
});
+
+/**
+ * Clear text selection
+ */
+function PMA_clearSelection() {
+ if(document.selection && document.selection.empty) {
+ document.selection.empty();
+ } else if(window.getSelection) {
+ var sel = window.getSelection();
+ if(sel.empty) sel.empty();
+ if(sel.removeAllRanges) sel.removeAllRanges();
+ }
+}
diff --git a/js/jquery/timepicker.js b/js/jquery/timepicker.js
index 4d1845ec43..41e3ea005d 100644
--- a/js/jquery/timepicker.js
+++ b/js/jquery/timepicker.js
@@ -1,480 +1,1060 @@
-/*!
- * jQuery UI Timepicker 0.2.1
- *
- * Copyright (c) 2009 Martin Milesich (http://milesich.com/)
- *
- * Some parts are
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- *
- * $Id: timepicker.js 28 2009-08-11 20:31:23Z majlo $
- *
- * Depends:
- * ui.core.js
- * ui.datepicker.js
- * ui.slider.js
- */
-(function($) {
-
-/**
- * Extending default values
- */
-$.extend($.datepicker._defaults, {
- 'dateFormat': 'yy-mm-dd',
- 'changeMonth': true,
- 'changeYear': true,
- 'stepSeconds': 1, // Number of seconds to step up/down
- 'stepMinutes': 1, // Number of minutes to step up/down
- 'stepHours': 1, // Number of hours to step up/down
- 'time24h': false, // True if 24h time
- 'showTime': false, // Show timepicker with datepicker
- 'altTimeField': '', // Selector for an alternate field to store time into
- 'hourText': 'Hour',
- 'minuteText': 'Minute',
- 'secondText': 'Second'
-});
-$.extend($.datepicker.regional[''], {
- 'hourText': 'Hour',
- 'minuteText': 'Minute',
- 'secondText': 'Second'
-});
-
-/**
- * _hideDatepicker must be called with null
- */
-$.datepicker._connectDatepickerOverride = $.datepicker._connectDatepicker;
-$.datepicker._connectDatepicker = function(target, inst) {
- $.datepicker._connectDatepickerOverride(target, inst);
-
- // showButtonPanel is required with timepicker
- if (this._get(inst, 'showTime')) {
- inst.settings['showButtonPanel'] = true;
- }
-
- var showOn = this._get(inst, 'showOn');
-
- if (showOn == 'button' || showOn == 'both') {
- // Unbind all click events
- inst.trigger.unbind('click');
-
- // Bind new click event
- inst.trigger.click(function() {
- if ($.datepicker._datepickerShowing && $.datepicker._lastInput == target)
- $.datepicker._hideDatepicker(null); // This override is all about the "null"
- else
- $.datepicker._showDatepicker(target);
- return false;
- });
- }
-};
-
-/**
- * Datepicker does not have an onShow event so I need to create it.
- * What I actually doing here is copying original _showDatepicker
- * method to _showDatepickerOverload method.
- */
-$.datepicker._showDatepickerOverride = $.datepicker._showDatepicker;
-$.datepicker._showDatepicker = function (input) {
- // Call the original method which will show the datepicker
- $.datepicker._showDatepickerOverride(input);
-
- input = input.target || input;
-
- // find from button/image trigger
- if (input.nodeName.toLowerCase() != 'input') input = $('input', input.parentNode)[0];
-
- // Do not show timepicker if datepicker is disabled
- if ($.datepicker._isDisabledDatepicker(input)) return;
-
- // Get instance to datepicker
- var inst = $.datepicker._getInst(input);
-
- var showTime = $.datepicker._get(inst, 'showTime');
-
- // If showTime = True show the timepicker
- if (showTime) $.timepicker.show(input);
-};
-
-/**
- * Same as above. Here I need to extend the _checkExternalClick method
- * because I don't want to close the datepicker when the sliders get focus.
- */
-$.datepicker._checkExternalClickOverride = $.datepicker._checkExternalClick;
-$.datepicker._checkExternalClick = function (event) {
- if (!$.datepicker._curInst) return;
- var $target = $(event.target);
-
- if (($target.parents('#' + $.timepicker._mainDivId).length == 0)) {
- $.datepicker._checkExternalClickOverride(event);
- }
-};
-
-/**
- * Datepicker has onHide event but I just want to make it simple for you
- * so I hide the timepicker when datepicker hides.
- */
-$.datepicker._hideDatepickerOverride = $.datepicker._hideDatepicker;
-$.datepicker._hideDatepicker = function(input, duration) {
- // Some lines from the original method
- var inst = this._curInst;
-
- if (!inst || (input && inst != $.data(input, PROP_NAME))) return;
-
- // Get the value of showTime property
- var showTime = this._get(inst, 'showTime');
-
- if (input === undefined && showTime) {
- if (inst.input) {
- inst.input.val(this._formatDate(inst));
- inst.input.trigger('change'); // fire the change event
- }
-
- this._updateAlternate(inst);
-
- if (showTime) $.timepicker.update(this._formatDate(inst));
- }
-
- // Hide datepicker
- $.datepicker._hideDatepickerOverride(input, duration);
-
- // Hide the timepicker if enabled
- if (showTime) {
- $.timepicker.hide();
- }
-};
-
-/**
- * This is a complete replacement of the _selectDate method.
- * If showed with timepicker do not close when date is selected.
- */
-$.datepicker._selectDate = function(id, dateStr) {
- var target = $(id);
- var inst = this._getInst(target[0]);
- var showTime = this._get(inst, 'showTime');
- dateStr = (dateStr != null ? dateStr : this._formatDate(inst));
- if (!showTime) {
- if (inst.input)
- inst.input.val(dateStr);
- this._updateAlternate(inst);
- }
- var onSelect = this._get(inst, 'onSelect');
- if (onSelect)
- onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]); // trigger custom callback
- else if (inst.input && !showTime)
- inst.input.trigger('change'); // fire the change event
- if (inst.inline)
- this._updateDatepicker(inst);
- else if (!inst.stayOpen) {
- if (showTime) {
- this._updateDatepicker(inst);
- } else {
- this._hideDatepicker(null, this._get(inst, 'duration'));
- this._lastInput = inst.input[0];
- if (typeof(inst.input[0]) != 'object')
- inst.input[0].focus(); // restore focus
- this._lastInput = null;
- }
- }
-};
-
-/**
- * We need to resize the timepicker when the datepicker has been changed.
- */
-$.datepicker._updateDatepickerOverride = $.datepicker._updateDatepicker;
-$.datepicker._updateDatepicker = function(inst) {
- $.datepicker._updateDatepickerOverride(inst);
- $.timepicker.resize();
-};
-
-function Timepicker() {}
-
-Timepicker.prototype = {
- init: function()
- {
- this._mainDivId = 'ui-timepicker-div';
- this._inputId = null;
- this._orgValue = null;
- this._orgHour = null;
- this._orgMinute = null;
- this._orgSecond = null;
- this._colonPos = -1;
- this._scolonPos = -1;
- this._visible = false;
- this.tpDiv = $('
');
- this._generateHtml();
- },
-
- show: function (input)
- {
- // Get instance to datepicker
- var inst = $.datepicker._getInst(input);
-
- this._time24h = $.datepicker._get(inst, 'time24h');
- this._altTimeField = $.datepicker._get(inst, 'altTimeField');
-
- var stepSeconds = parseInt($.datepicker._get(inst, 'stepSeconds'), 10) || 1;
- var stepMinutes = parseInt($.datepicker._get(inst, 'stepMinutes'), 10) || 1;
- var stepHours = parseInt($.datepicker._get(inst, 'stepHours'), 10) || 1;
-
- if (60 % stepSeconds != 0) { stepSeconds = 1; }
- if (60 % stepMinutes != 0) { stepMinutes = 1; }
- if (24 % stepHours != 0) { stepHours = 1; }
-
- $('#hourSlider').slider('option', 'max', 24 - stepHours);
- $('#hourSlider').slider('option', 'step', stepHours);
-
- $('#minuteSlider').slider('option', 'max', 60 - stepMinutes);
- $('#minuteSlider').slider('option', 'step', stepMinutes);
-
- $('#secondSlider').slider('option', 'max', 60 - stepSeconds);
- $('#secondSlider').slider('option', 'step', stepSeconds);
-
- $('.hour_text').html($.datepicker._get(inst, 'hourText'));
- $('.minute_text').html($.datepicker._get(inst, 'minuteText'));
- $('.second_text').html($.datepicker._get(inst, 'secondText'));
-
- this._inputId = input.id;
-
- if (!this._visible) {
- this._parseTime();
- this._orgValue = $('#' + this._inputId).val();
- }
-
- this.resize();
-
- $('#' + this._mainDivId).show();
-
- this._visible = true;
-
- var dpDiv = $('#' + $.datepicker._mainDivId);
- var dpDivPos = dpDiv.position();
-
- var viewWidth = (window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth) + $(document).scrollLeft();
- var tpRight = this.tpDiv.offset().left + this.tpDiv.outerWidth();
-
- if (tpRight > viewWidth) {
- dpDiv.css('left', dpDivPos.left - (tpRight - viewWidth) - 5);
- this.tpDiv.css('left', dpDiv.offset().left + dpDiv.outerWidth() + 'px');
- }
- },
-
- update: function (fd)
- {
- var curTime = $('#' + this._mainDivId + ' span.fragHours').text()
- + ':'
- + $('#' + this._mainDivId + ' span.fragMinutes').text()
- + ':'
- + $('#' + this._mainDivId + ' span.fragSeconds').text()
- ;
-
- if (!this._time24h) {
- curTime += ' ' + $('#' + this._mainDivId + ' span.fragAmpm').text();
- }
-
- var curDate = $('#' + this._inputId).val();
-
- $('#' + this._inputId).val(fd + ' ' + curTime);
-
- if (this._altTimeField) {
- $(this._altTimeField).each(function() { $(this).val(curTime); });
- }
- },
-
- hide: function ()
- {
- this._visible = false;
- $('#' + this._mainDivId).hide();
- },
-
- resize: function ()
- {
- var dpDiv = $('#' + $.datepicker._mainDivId);
- var dpDivPos = dpDiv.position();
-
- var hdrHeight = $('#' + $.datepicker._mainDivId + ' > div.ui-datepicker-header:first-child').height();
-
- $('#' + this._mainDivId + ' > div.ui-datepicker-header:first-child').css('height', hdrHeight);
-
- this.tpDiv.css({
- 'height': dpDiv.height(),
- 'top' : dpDivPos.top,
- 'left' : dpDivPos.left + dpDiv.outerWidth() + 'px'
- });
-
- $('#hourSlider').css('height', this.tpDiv.height() - (3.5 * hdrHeight));
- $('#minuteSlider').css('height', this.tpDiv.height() - (3.5 * hdrHeight));
- $('#secondSlider').css('height', this.tpDiv.height() - (3.5 * hdrHeight));
- },
-
- _generateHtml: function ()
- {
- var html = '';
-
- html += '';
- html += '| ';
- html += 'Hour';
- html += ' | ';
- html += 'Minute';
- html += ' | ';
- html += 'Second';
- html += ' |
';
- html += ' | | |
';
- html += '
';
-
- this.tpDiv.empty().append(html);
- $('body').append(this.tpDiv);
-
- var self = this;
-
- $('#hourSlider').slider({
- orientation: "vertical",
- range: 'min',
- min: 0,
- max: 23,
- step: 1,
- slide: function(event, ui) {
- self._writeTime('hour', ui.value);
- },
- stop: function(event, ui) {
- $('#' + self._inputId).focus();
- }
- });
-
- $('#minuteSlider').slider({
- orientation: "vertical",
- range: 'min',
- min: 0,
- max: 59,
- step: 1,
- slide: function(event, ui) {
- self._writeTime('minute', ui.value);
- },
- stop: function(event, ui) {
- $('#' + self._inputId).focus();
- }
- });
-
- $('#secondSlider').slider({
- orientation: "vertical",
- range: 'min',
- min: 0,
- max: 59,
- step: 1,
- slide: function(event, ui) {
- self._writeTime('second', ui.value);
- },
- stop: function(event, ui) {
- $('#' + self._inputId).focus();
- }
- });
-
- $('#hourSlider > a').css('padding', 0);
- $('#minuteSlider > a').css('padding', 0);
- $('#secondSlider > a').css('padding', 0);
- },
-
- _writeTime: function (type, value)
- {
- if (type == 'hour') {
- if (!this._time24h) {
- if (value < 12) {
- $('#' + this._mainDivId + ' span.fragAmpm').text('am');
- } else {
- $('#' + this._mainDivId + ' span.fragAmpm').text('pm');
- value -= 12;
- }
-
- if (value == 0) value = 12;
- } else {
- $('#' + this._mainDivId + ' span.fragAmpm').text('');
- }
-
- if (value < 10) value = '0' + value;
- $('#' + this._mainDivId + ' span.fragHours').text(value);
- }
-
- if (type == 'minute') {
- if (value < 10) value = '0' + value;
- $('#' + this._mainDivId + ' span.fragMinutes').text(value);
- }
-
- if (type == 'second') {
- if (value < 10) value = '0' + value;
- $('#' + this._mainDivId + ' span.fragSeconds').text(value);
- }
- },
-
- _parseTime: function ()
- {
- var dt = $('#' + this._inputId).val();
-
- this._colonPos = dt.search(':');
-
- var m = 0, h = 0, s = 0, a = '';
-
- if (this._colonPos != -1) {
- this._scolonPos = dt.substring(this._colonPos + 1).search(':');
- h = parseInt(dt.substr(this._colonPos - 2, 2), 10);
- m = parseInt(dt.substr(this._colonPos + 1, 2), 10);
- if (this._scolonPos != -1) {
- this._scolonPos += this._colonPos + 1;
- s = parseInt(dt.substr(this._scolonPos + 1, 2), 10);
- a = jQuery.trim(dt.substr(this._scolonPos + 3, 3));
- } else {
- a = jQuery.trim(dt.substr(this._colonPos + 3, 3));
- }
- }
-
- a = a.toLowerCase();
-
- if (a != 'am' && a != 'pm') {
- a = '';
- }
-
- if (h < 0) h = 0;
- if (m < 0) m = 0;
-
- if (h > 23) h = 23;
- if (m > 59) m = 59;
-
- if (a == 'pm' && h < 12) h += 12;
- if (a == 'am' && h == 12) h = 0;
-
- this._setTime('hour', h);
- this._setTime('minute', m);
- this._setTime('second', s);
-
- this._orgHour = h;
- this._orgMinute = m;
- this._orgSecond = s;
- },
-
- _setTime: function (type, value)
- {
- if (isNaN(value)) value = 0;
- if (value < 0) value = 0;
- if (value > 23 && type == 'hour') value = 23;
- if (value > 59 && type == 'minute') value = 59;
- if (value > 59 && type == 'second') value = 59;
-
- if (type == 'hour') {
- $('#hourSlider').slider('value', value);
- }
-
- if (type == 'minute') {
- $('#minuteSlider').slider('value', value);
- }
-
- if (type == 'second') {
- $('#secondSlider').slider('value', value);
- }
-
- this._writeTime(type, value);
- }
-};
-
-$.timepicker = new Timepicker();
-$('document').ready(function () {$.timepicker.init();});
-
-})(jQuery);
+/*
+* jQuery timepicker addon
+* By: Trent Richardson [http://trentrichardson.com]
+* Version 0.9.6
+* Last Modified: 07/20/2011
+*
+* Copyright 2011 Trent Richardson
+* Dual licensed under the MIT and GPL licenses.
+* http://trentrichardson.com/Impromptu/GPL-LICENSE.txt
+* 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 td { font-size: 90%; }
+*/
+
+(function($) {
+
+$.extend($.ui, { timepicker: { version: "0.9.6" } });
+
+/* Time picker manager.
+ Use the singleton instance of this class, $.timepicker, to interact with the time picker.
+ Settings for (groups of) time pickers are maintained in an instance object,
+ allowing multiple different settings on the same page. */
+
+function Timepicker() {
+ this.regional = []; // Available regional settings, indexed by language code
+ this.regional[''] = { // Default regional settings
+ currentText: 'Now',
+ closeText: 'Done',
+ ampm: false,
+ timeFormat: 'hh:mm tt',
+ timeSuffix: '',
+ timeOnlyTitle: 'Choose Time',
+ timeText: 'Time',
+ hourText: 'Hour',
+ minuteText: 'Minute',
+ secondText: 'Second',
+ timezoneText: 'Time Zone'
+ };
+ this._defaults = { // Global defaults for all the datetime picker instances
+ showButtonPanel: true,
+ timeOnly: false,
+ showHour: true,
+ showMinute: true,
+ showSecond: false,
+ showTimezone: false,
+ showTime: true,
+ stepHour: 0.05,
+ stepMinute: 0.05,
+ stepSecond: 0.05,
+ hour: 0,
+ minute: 0,
+ second: 0,
+ timezone: '+0000',
+ hourMin: 0,
+ minuteMin: 0,
+ secondMin: 0,
+ hourMax: 23,
+ minuteMax: 59,
+ secondMax: 59,
+ minDateTime: null,
+ maxDateTime: null,
+ hourGrid: 0,
+ minuteGrid: 0,
+ secondGrid: 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"]
+ };
+ $.extend(this._defaults, this.regional['']);
+}
+
+$.extend(Timepicker.prototype, {
+ $input: null,
+ $altInput: null,
+ $timeObj: null,
+ inst: null,
+ hour_slider: null,
+ minute_slider: null,
+ second_slider: null,
+ timezone_select: null,
+ hour: 0,
+ minute: 0,
+ second: 0,
+ timezone: '+0000',
+ hourMinOriginal: null,
+ minuteMinOriginal: null,
+ secondMinOriginal: null,
+ hourMaxOriginal: null,
+ minuteMaxOriginal: null,
+ secondMaxOriginal: 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"],
+
+ /* Override the default settings for all instances of the time picker.
+ @param settings object - the new settings to use as defaults (anonymous object)
+ @return the manager object */
+ setDefaults: function(settings) {
+ extendRemove(this._defaults, settings || {});
+ return this;
+ },
+
+ //########################################################################
+ // Create a new Timepicker instance
+ //########################################################################
+ _newInst: function($input, o) {
+ var tp_inst = new Timepicker(),
+ inlineSettings = {};
+
+ for (var attrName in this._defaults) {
+ var attrValue = $input.attr('time:' + attrName);
+ if (attrValue) {
+ try {
+ inlineSettings[attrName] = eval(attrValue);
+ } catch (err) {
+ inlineSettings[attrName] = attrValue;
+ }
+ }
+ }
+ tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, o, {
+ beforeShow: function(input, dp_inst) {
+ if ($.isFunction(o.beforeShow))
+ o.beforeShow(input, dp_inst, tp_inst);
+ },
+ onChangeMonthYear: function(year, month, dp_inst) {
+ // Update the time as well : this prevents the time from disappearing from the $input field.
+ tp_inst._updateDateTime(dp_inst);
+ if ($.isFunction(o.onChangeMonthYear))
+ o.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst);
+ },
+ onClose: function(dateText, dp_inst) {
+ if (tp_inst.timeDefined === true && $input.val() != '')
+ tp_inst._updateDateTime(dp_inst);
+ if ($.isFunction(o.onClose))
+ o.onClose.call($input[0], dateText, dp_inst, tp_inst);
+ },
+ timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker');
+ });
+
+ tp_inst.hour = tp_inst._defaults.hour;
+ tp_inst.minute = tp_inst._defaults.minute;
+ tp_inst.second = tp_inst._defaults.second;
+ tp_inst.ampm = '';
+ tp_inst.$input = $input;
+
+ if (o.altField)
+ tp_inst.$altInput = $(o.altField)
+ .css({ cursor: 'pointer' })
+ .focus(function(){ $input.trigger("focus"); });
+
+ // 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());
+ if(tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date)
+ tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime());
+ if(tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date)
+ 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;
+ },
+
+ //########################################################################
+ // add our sliders to the calendar
+ //########################################################################
+ _addTimePicker: function(dp_inst) {
+ var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ?
+ this.$input.val() + ' ' + this.$altInput.val() :
+ this.$input.val();
+
+ this.timeDefined = this._parseTime(currDT);
+ this._limitMinMaxDateTime(dp_inst, false);
+ this._injectTimePicker();
+ },
+
+ //########################################################################
+ // parse the time string from input value or _setTime
+ //########################################################################
+ _parseTime: function(timeString, withDate) {
+ 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(/z{1}/ig, '((\\+|-)\\d\\d\\d\\d)?')
+ .replace(/\s/g, '\\s?') + this._defaults.timeSuffix + '$',
+ order = this._getFormatPositions(),
+ treg;
+
+ if (!this.inst) this.inst = $.datepicker._getInst(this.$input[0]);
+
+ if (withDate || !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
+ var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
+ // escape special regex characters in the seperator
+ var specials = new RegExp("[.*+?|()\\[\\]{}\\\\]", "g");
+ regstr = '.{' + dp_dateFormat.length + ',}' + this._defaults.separator.replace(specials, "\\$&") + regstr;
+ }
+
+ 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.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 = 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];
+
+ return true;
+
+ }
+ return false;
+ },
+
+ //########################################################################
+ // 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 };
+
+ 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() {
+ var $dp = this.inst.dpDiv,
+ o = this._defaults,
+ tp_inst = this,
+ // 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),
+ dp_id = this.inst.id.toString().replace(/([^A-Za-z0-9_])/g, '');
+
+ // Prevent displaying twice
+ //if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0) {
+ if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0 && o.showTimepicker) {
+ var noDisplay = ' style="display:none;"',
+ html = '' +
+ '- ' + o.timeText + '
' +
+ '' +
+ '- ' + o.hourText + '
',
+ hourGridSize = 0,
+ minuteGridSize = 0,
+ secondGridSize = 0,
+ size;
+
+ if (o.showHour && o.hourGrid > 0) {
+ html += '- ' +
+ '' +
+ '
';
+
+ for (var h = o.hourMin; h <= hourMax; h += o.hourGrid) {
+ hourGridSize++;
+ var tmph = (o.ampm && h > 12) ? h-12 : h;
+ if (tmph < 10) tmph = '0' + tmph;
+ if (o.ampm) {
+ if (h == 0) tmph = 12 +'a';
+ else if (h < 12) tmph += 'a';
+ else tmph += 'p';
+ }
+ html += '| ' + tmph + ' | ';
+ }
+
+ html += '
' +
+ ' ';
+ } else html += '';
+
+ html += '- ' + o.minuteText + '
';
+
+ if (o.showMinute && o.minuteGrid > 0) {
+ html += '- ' +
+ '' +
+ '
';
+
+ for (var m = o.minuteMin; m <= minMax; m += o.minuteGrid) {
+ minuteGridSize++;
+ html += '| ' + ((m < 10) ? '0' : '') + m + ' | ';
+ }
+
+ html += '
' +
+ ' ';
+ } else html += '';
+
+ html += '- ' + o.secondText + '
';
+
+ if (o.showSecond && o.secondGrid > 0) {
+ html += '- ' +
+ '' +
+ '
';
+
+ for (var s = o.secondMin; s <= secMax; s += o.secondGrid) {
+ secondGridSize++;
+ html += '| ' + ((s < 10) ? '0' : '') + s + ' | ';
+ }
+
+ html += '
' +
+ ' ';
+ } else html += '';
+
+ html += '- ' + o.timezoneText + '
';
+ html += '';
+
+ html += '
';
+ $tp = $(html);
+
+ // if we only want time picker...
+ if (o.timeOnly === true) {
+ $tp.prepend(
+ '');
+ $dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide();
+ }
+
+ this.hour_slider = $tp.find('#ui_tpicker_hour_'+ dp_id).slider({
+ orientation: "horizontal",
+ value: this.hour,
+ min: o.hourMin,
+ max: hourMax,
+ step: o.stepHour,
+ slide: function(event, ui) {
+ tp_inst.hour_slider.slider( "option", "value", ui.value);
+ tp_inst._onTimeChange();
+ }
+ });
+
+ // Updated by Peter Medeiros:
+ // - Pass in Event and UI instance into slide function
+ this.minute_slider = $tp.find('#ui_tpicker_minute_'+ dp_id).slider({
+ orientation: "horizontal",
+ value: this.minute,
+ min: o.minuteMin,
+ max: minMax,
+ step: o.stepMinute,
+ slide: function(event, ui) {
+ // update the global minute slider instance value with the current slider value
+ tp_inst.minute_slider.slider( "option", "value", ui.value);
+ tp_inst._onTimeChange();
+ }
+ });
+
+ this.second_slider = $tp.find('#ui_tpicker_second_'+ dp_id).slider({
+ orientation: "horizontal",
+ value: this.second,
+ min: o.secondMin,
+ max: secMax,
+ step: o.stepSecond,
+ slide: function(event, ui) {
+ tp_inst.second_slider.slider( "option", "value", ui.value);
+ tp_inst._onTimeChange();
+ }
+ });
+
+
+ this.timezone_select = $tp.find('#ui_tpicker_timezone_'+ dp_id).append('').find("select");
+ $.fn.append.apply(this.timezone_select,
+ $.map(o.timezoneList, function(val, idx) {
+ return $("")
+ .val(typeof val == "object" ? val.value : val)
+ .text(typeof val == "object" ? val.label : val);
+ })
+ );
+ this.timezone_select.val((typeof this.timezone != "undefined" && this.timezone != null && this.timezone != "") ? this.timezone : o.timezone);
+ this.timezone_select.change(function() {
+ tp_inst._onTimeChange();
+ });
+
+ // Add grid functionality
+ if (o.showHour && o.hourGrid > 0) {
+ size = 100 * hourGridSize * o.hourGrid / (hourMax - o.hourMin);
+
+ $tp.find(".ui_tpicker_hour table").css({
+ width: size + "%",
+ marginLeft: (size / (-2 * hourGridSize)) + "%",
+ borderCollapse: 'collapse'
+ }).find("td").each( function(index) {
+ $(this).click(function() {
+ var h = $(this).html();
+ if(o.ampm) {
+ var ap = h.substring(2).toLowerCase(),
+ aph = parseInt(h.substring(0,2), 10);
+ if (ap == 'a') {
+ if (aph == 12) h = 0;
+ else h = aph;
+ } else if (aph == 12) h = 12;
+ else h = aph + 12;
+ }
+ tp_inst.hour_slider.slider("option", "value", h);
+ tp_inst._onTimeChange();
+ tp_inst._onSelectHandler();
+ }).css({
+ cursor: 'pointer',
+ width: (100 / hourGridSize) + '%',
+ textAlign: 'center',
+ overflow: 'hidden'
+ });
+ });
+ }
+
+ if (o.showMinute && o.minuteGrid > 0) {
+ size = 100 * minuteGridSize * o.minuteGrid / (minMax - o.minuteMin);
+ $tp.find(".ui_tpicker_minute table").css({
+ width: size + "%",
+ marginLeft: (size / (-2 * minuteGridSize)) + "%",
+ borderCollapse: 'collapse'
+ }).find("td").each(function(index) {
+ $(this).click(function() {
+ tp_inst.minute_slider.slider("option", "value", $(this).html());
+ tp_inst._onTimeChange();
+ tp_inst._onSelectHandler();
+ }).css({
+ cursor: 'pointer',
+ width: (100 / minuteGridSize) + '%',
+ textAlign: 'center',
+ overflow: 'hidden'
+ });
+ });
+ }
+
+ if (o.showSecond && o.secondGrid > 0) {
+ $tp.find(".ui_tpicker_second table").css({
+ width: size + "%",
+ marginLeft: (size / (-2 * secondGridSize)) + "%",
+ borderCollapse: 'collapse'
+ }).find("td").each(function(index) {
+ $(this).click(function() {
+ tp_inst.second_slider.slider("option", "value", $(this).html());
+ tp_inst._onTimeChange();
+ tp_inst._onSelectHandler();
+ }).css({
+ cursor: 'pointer',
+ width: (100 / secondGridSize) + '%',
+ textAlign: 'center',
+ overflow: 'hidden'
+ });
+ });
+ }
+
+ var $buttonPanel = $dp.find('.ui-datepicker-buttonpane');
+ if ($buttonPanel.length) $buttonPanel.before($tp);
+ else $dp.append($tp);
+
+ this.$timeObj = $tp.find('#ui_tpicker_time_'+ dp_id);
+
+ if (this.inst !== null) {
+ var timeDefined = this.timeDefined;
+ this._onTimeChange();
+ this.timeDefined = timeDefined;
+ }
+
+ //Emulate datepicker onSelect behavior. Call on slidestop.
+ var onSelectDelegate = function() {
+ tp_inst._onSelectHandler();
+ };
+ this.hour_slider.bind('slidestop',onSelectDelegate);
+ this.minute_slider.bind('slidestop',onSelectDelegate);
+ this.second_slider.bind('slidestop',onSelectDelegate);
+ }
+ },
+
+ //########################################################################
+ // This function tries to limit the ability to go outside the
+ // min/max date range
+ //########################################################################
+ _limitMinMaxDateTime: function(dp_inst, adjustSliders){
+ var o = this._defaults,
+ dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay);
+
+ if(!this._defaults.showTimepicker) return; // No time so nothing to check here
+
+ if($.datepicker._get(dp_inst, 'minDateTime') !== null && 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){
+ this.hourMinOriginal = o.hourMin;
+ this.minuteMinOriginal = o.minuteMin;
+ this.secondMinOriginal = o.secondMin;
+ }
+
+ if(dp_inst.settings.timeOnly || minDateTimeDate.getTime() == dp_date.getTime()) {
+ this._defaults.hourMin = minDateTime.getHours();
+ if (this.hour <= this._defaults.hourMin) {
+ this.hour = this._defaults.hourMin;
+ this._defaults.minuteMin = minDateTime.getMinutes();
+ 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.secondMin = this.secondMinOriginal;
+ }
+ } else {
+ this._defaults.minuteMin = this.minuteMinOriginal;
+ this._defaults.secondMin = this.secondMinOriginal;
+ }
+ }else{
+ this._defaults.hourMin = this.hourMinOriginal;
+ this._defaults.minuteMin = this.minuteMinOriginal;
+ this._defaults.secondMin = this.secondMinOriginal;
+ }
+ }
+
+ if($.datepicker._get(dp_inst, 'maxDateTime') !== null && 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;
+ }
+
+ if(dp_inst.settings.timeOnly || maxDateTimeDate.getTime() == dp_date.getTime()){
+ this._defaults.hourMax = maxDateTime.getHours();
+ if (this.hour >= this._defaults.hourMax) {
+ this.hour = this._defaults.hourMax;
+ this._defaults.minuteMax = maxDateTime.getMinutes();
+ if (this.minute >= this._defaults.minuteMax) {
+ this.minute = this._defaults.minuteMax;
+ this._defaults.secondMax = maxDateTime.getSeconds();
+ } else {
+ if(this.second > this._defaults.secondMax) this.second = this._defaults.secondMax;
+ this._defaults.secondMax = this.secondMaxOriginal;
+ }
+ } else {
+ this._defaults.minuteMax = this.minuteMaxOriginal;
+ this._defaults.secondMax = this.secondMaxOriginal;
+ }
+ }else{
+ this._defaults.hourMax = this.hourMaxOriginal;
+ this._defaults.minuteMax = this.minuteMaxOriginal;
+ this._defaults.secondMax = this.secondMaxOriginal;
+ }
+ }
+
+ if(adjustSliders !== undefined && adjustSliders === true){
+ var hourMax = (this._defaults.hourMax - (this._defaults.hourMax % this._defaults.stepHour)).toFixed(0),
+ minMax = (this._defaults.minuteMax - (this._defaults.minuteMax % this._defaults.stepMinute)).toFixed(0),
+ secMax = (this._defaults.secondMax - (this._defaults.secondMax % this._defaults.stepSecond)).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);
+ }
+
+ },
+
+
+ //########################################################################
+ // when a slider moves, set the internal time...
+ // on time change is also called when the time is updated in the text field
+ //########################################################################
+ _onTimeChange: function() {
+ 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;
+
+ if (typeof(hour) == 'object') hour = false;
+ if (typeof(minute) == 'object') minute = false;
+ if (typeof(second) == 'object') second = 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);
+
+ 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);
+
+ if (hasChanged) {
+
+ if (hour !== false)this.hour = hour;
+ if (minute !== false) this.minute = minute;
+ if (second !== false) this.second = second;
+ 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;
+
+ this._formatTime();
+ if (this.$timeObj) this.$timeObj.text(this.formattedTime + this._defaults.timeSuffix);
+ this.timeDefined = true;
+ if (hasChanged) this._updateDateTime();
+ },
+
+ //########################################################################
+ // call custom onSelect.
+ // bind to sliders slidestop, and grid click.
+ //########################################################################
+ _onSelectHandler: function() {
+ var onSelect = this._defaults['onSelect'];
+ var inputEl = this.$input ? this.$input[0] : null;
+ if (onSelect && inputEl) {
+ onSelect.apply(inputEl, [this.formattedDateTime, this]);
+ }
+ },
+
+ //########################################################################
+ // format the time all pretty...
+ //########################################################################
+ _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();
+
+ 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 (arguments.length) return tmptime;
+ else this.formattedTime = tmptime;
+ },
+
+ //########################################################################
+ // update our input with the new date time..
+ //########################################################################
+ _updateDateTime: function(dp_inst) {
+ dp_inst = this.inst || dp_inst,
+ dt = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay),
+ dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
+ formatCfg = $.datepicker._getFormatConfig(dp_inst),
+ timeAvailable = dt !== null && this.timeDefined;
+ this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg);
+ var formattedDateTime = this.formattedDate;
+ if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0))
+ return;
+
+ if (this._defaults.timeOnly === true) {
+ formattedDateTime = this.formattedTime;
+ } else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) {
+ formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
+ }
+
+ this.formattedDateTime = formattedDateTime;
+
+ if(!this._defaults.showTimepicker) {
+ this.$input.val(this.formattedDate);
+ } else if (this.$altInput && this._defaults.altFieldTimeOnly === true) {
+ this.$altInput.val(this.formattedTime);
+ this.$input.val(this.formattedDate);
+ } else if(this.$altInput) {
+ this.$altInput.val(formattedDateTime);
+ this.$input.val(formattedDateTime);
+ } else {
+ this.$input.val(formattedDateTime);
+ }
+
+ this.$input.trigger("change");
+ }
+
+});
+
+$.fn.extend({
+ //########################################################################
+ // shorthand just to use timepicker..
+ //########################################################################
+ timepicker: function(o) {
+ o = o || {};
+ var tmp_args = arguments;
+
+ if (typeof o == 'object') tmp_args[0] = $.extend(o, { timeOnly: true });
+
+ return $(this).each(function() {
+ $.fn.datetimepicker.apply($(this), tmp_args);
+ });
+ },
+
+ //########################################################################
+ // extend timepicker to datepicker
+ //########################################################################
+ datetimepicker: function(o) {
+ o = o || {};
+ var $input = this,
+ tmp_args = arguments;
+
+ if (typeof(o) == 'string'){
+ if(o == 'getDate')
+ return $.fn.datepicker.apply($(this[0]), tmp_args);
+ else
+ return this.each(function() {
+ var $t = $(this);
+ $t.datepicker.apply($t, tmp_args);
+ });
+ }
+ else
+ return this.each(function() {
+ var $t = $(this);
+ $t.datepicker($.timepicker._newInst($t, o)._defaults);
+ });
+ }
+});
+
+//########################################################################
+// 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._base_selectDate = $.datepicker._selectDate;
+$.datepicker._selectDate = function (id, dateStr) {
+ var inst = this._getInst($(id)[0]),
+ tp_inst = this._get(inst, 'timepicker');
+
+ if (tp_inst) {
+ 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 + tp_inst._defaults.timeSuffix);
+ inst.inline = inst.stay_open = false;
+ this._notifyChange(inst);
+ this._updateDatepicker(inst);
+ }
+ else this._base_selectDate(id, dateStr);
+};
+
+//#############################################################################################
+// second bad hack :/ override datepicker so it triggers an event when changing the input field
+// and does not redraw the datepicker on every selectDate event
+//#############################################################################################
+$.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);
+
+ // Reload the time control when changing something in the input text field.
+ var tp_inst = this._get(inst, 'timepicker');
+ if(tp_inst) tp_inst._addTimePicker(inst);
+ }
+};
+
+//#######################################################################################
+// third bad hack :/ override datepicker so it allows spaces and colon in the input field
+//#######################################################################################
+$.datepicker._base_doKeyPress = $.datepicker._doKeyPress;
+$.datepicker._doKeyPress = function(event) {
+ var inst = $.datepicker._getInst(event.target),
+ tp_inst = $.datepicker._get(inst, 'timepicker');
+
+ 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' : '')
+ .replace(/Tt/g, ampm ? 'AaPpMm' : '')
+ .replace(/tT/g, ampm ? 'AaPpMm' : '')
+ .replace(/T/g, ampm ? 'AP' : '')
+ .replace(/tt/g, ampm ? 'apm' : '')
+ .replace(/t/g, ampm ? 'ap' : '') +
+ " " +
+ tp_inst._defaults.separator +
+ tp_inst._defaults.timeSuffix +
+ (tp_inst._defaults.showTimezone ? tp_inst._defaults.timezoneList.join('') : '') +
+ dateChars,
+ chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
+ return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
+ }
+ }
+
+ return $.datepicker._base_doKeyPress(event);
+};
+
+//#######################################################################################
+// Override key up event to sync manual input changes.
+//#######################################################################################
+$.datepicker._base_doKeyUp = $.datepicker._doKeyUp;
+$.datepicker._doKeyUp = function (event) {
+ var inst = $.datepicker._getInst(event.target),
+ tp_inst = $.datepicker._get(inst, 'timepicker');
+
+ if (tp_inst) {
+ if (tp_inst._defaults.timeOnly && (inst.input.val() != inst.lastVal)) {
+ try {
+ $.datepicker._updateDatepicker(inst);
+ }
+ catch (err) {
+ $.datepicker.log(err);
+ }
+ }
+ }
+
+ return $.datepicker._base_doKeyUp(event);
+};
+
+//#######################################################################################
+// override "Today" button to also grab the time.
+//#######################################################################################
+$.datepicker._base_gotoToday = $.datepicker._gotoToday;
+$.datepicker._gotoToday = function(id) {
+ this._base_gotoToday(id);
+ this._setTime(this._getInst($(id)[0]), new Date());
+};
+
+//#######################################################################################
+// Disable & enable the Time in the datetimepicker
+//#######################################################################################
+$.datepicker._disableTimepickerDatepicker = function(target, date, withDate) {
+ var inst = this._getInst(target),
+ tp_inst = this._get(inst, 'timepicker');
+ $(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+ if (tp_inst) {
+ tp_inst._defaults.showTimepicker = false;
+ tp_inst._updateDateTime(inst);
+ }
+};
+
+$.datepicker._enableTimepickerDatepicker = function(target, date, withDate) {
+ var inst = this._getInst(target),
+ tp_inst = this._get(inst, 'timepicker');
+ $(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+ if (tp_inst) {
+ tp_inst._defaults.showTimepicker = true;
+ tp_inst._addTimePicker(inst); // Could be disabled on page load
+ tp_inst._updateDateTime(inst);
+ }
+};
+
+//#######################################################################################
+// Create our own set time function
+//#######################################################################################
+$.datepicker._setTime = function(inst, date) {
+ var tp_inst = this._get(inst, 'timepicker');
+ if (tp_inst) {
+ var defaults = tp_inst._defaults,
+ // 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;
+
+ //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)) {
+ hour = defaults.hourMin;
+ minute = defaults.minuteMin;
+ second = defaults.secondMin;
+ }
+
+ tp_inst.hour = hour;
+ tp_inst.minute = minute;
+ tp_inst.second = second;
+
+ if (tp_inst.hour_slider) tp_inst.hour_slider.slider('value', hour);
+ if (tp_inst.minute_slider) tp_inst.minute_slider.slider('value', minute);
+ if (tp_inst.second_slider) tp_inst.second_slider.slider('value', second);
+
+ tp_inst._onTimeChange();
+ tp_inst._updateDateTime(inst);
+ }
+};
+
+//#######################################################################################
+// Create new public method to set only time, callable as $().datepicker('setTime', date)
+//#######################################################################################
+$.datepicker._setTimeDatepicker = function(target, date, withDate) {
+ var inst = this._getInst(target),
+ tp_inst = this._get(inst, 'timepicker');
+
+ if (tp_inst) {
+ this._setDateFromField(inst);
+ var tp_date;
+ if (date) {
+ 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);
+ }
+ else tp_date = new Date(date.getTime());
+ if (tp_date.toString() == 'Invalid Date') tp_date = undefined;
+ this._setTime(inst, tp_date);
+ }
+ }
+
+};
+
+//#######################################################################################
+// override setDate() to allow setting time too within Date object
+//#######################################################################################
+$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
+$.datepicker._setDateDatepicker = function(target, date) {
+ var inst = this._getInst(target),
+ tp_date = (date instanceof Date) ? new Date(date.getTime()) : date;
+
+ this._updateDatepicker(inst);
+ this._base_setDateDatepicker.apply(this, arguments);
+ this._setTimeDatepicker(target, tp_date, true);
+};
+
+//#######################################################################################
+// override getDate() to allow getting time too within Date object
+//#######################################################################################
+$.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker;
+$.datepicker._getDateDatepicker = function(target, noDefault) {
+ var inst = this._getInst(target),
+ tp_inst = this._get(inst, 'timepicker');
+
+ 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);
+ 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 options setter to add time to maxDate(Time) and minDate(Time)
+//#######################################################################################
+$.datepicker._base_optionDatepicker = $.datepicker._optionDatepicker;
+$.datepicker._optionDatepicker = function(target, name, value) {
+ this._base_optionDatepicker(target, name, value);
+ var inst = this._getInst(target),
+ tp_inst = this._get(inst, 'timepicker');
+ if (tp_inst) {
+ //Set minimum and maximum date values if we have timepicker
+ if(name==='minDate') {
+ if(tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date)
+ tp_inst._defaults.minDateTime = new Date(value);
+ if(tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date)
+ tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime());
+ tp_inst._limitMinMaxDateTime(inst,true);
+ }
+ if(name==='maxDate') {
+ if(tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date)
+ tp_inst._defaults.maxDateTime = new Date(value);
+ if(tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date)
+ tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());
+ tp_inst._limitMinMaxDateTime(inst,true);
+ }
+ }
+};
+
+//#######################################################################################
+// jQuery extend now ignores nulls!
+//#######################################################################################
+function extendRemove(target, props) {
+ $.extend(target, props);
+ for (var name in props)
+ if (props[name] === null || props[name] === undefined)
+ target[name] = props[name];
+ return target;
+}
+
+$.timepicker = new Timepicker(); // singleton instance
+$.timepicker.version = "0.9.6";
+
+})(jQuery);
diff --git a/js/makegrid.js b/js/makegrid.js
index 1fd07c1309..1a51eb90ee 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -660,6 +660,8 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
$(g.cEdit).find('input[type=text]').blur();
g.isCellEditActive = false;
g.currentEditCell = null;
+ // destroy datepicker in edit area, if exist
+ $(g.cEdit).find('.hasDatepicker').datepicker('destroy');
},
/**
@@ -727,7 +729,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
$checkbox.attr('checked', false);
})
} else {
- $(g.cEdit).find('input[type=text]').live('change', function(e) {
+ $(g.cEdit).find('input[type=text]').live('keypress change', function(e) {
$checkbox.attr('checked', false);
})
$editArea.find('textarea').live('keydown', function(e) {
@@ -914,6 +916,33 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
}) // end $.post()
}
g.isEditCellTextEditable = true;
+ } else if ($td.is('.datefield, .datetimefield, .timestampfield')) {
+ var $input_field = $(g.cEdit).find('input[type=text]');
+
+ // remember current datetime value in $input_field, if it is not null
+ var is_null = $td.is('.null');
+ var current_datetime_value = !is_null ? $input_field.val() : '';
+
+ var showTimeOption = true;
+ if ($td.is('.datefield')) {
+ showTimeOption = false;
+ }
+ PMA_addDatepicker($editArea, {
+ altField: $input_field,
+ showTimepicker: showTimeOption,
+ onSelect: function(dateText, inst) {
+ // remove null checkbox if it exists
+ $(g.cEdit).find('.null_div input[type=checkbox]').attr('checked', false);
+ }
+ });
+
+ // force to restore modified $input_field value after adding datepicker
+ // (after adding a datepicker, the input field doesn't display the time anymore, only the date)
+ if (!is_null) {
+ $editArea.datetimepicker('setDate', current_datetime_value);
+ } else {
+ $input_field.val('');
+ }
} else {
$editArea.append('');
$editArea.find('textarea').live('keyup', function(e) {
@@ -1225,16 +1254,14 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
need_to_post = true;
}
} else {
- if($this_field.is(":not(.relation, .enum, .set, .bit)")) {
- this_field_params[field_name] = $(g.cEdit).find('textarea').val();
- } else if ($this_field.is('.bit')) {
+ if ($this_field.is('.bit')) {
this_field_params[field_name] = '0b' + $(g.cEdit).find('textarea').val();
} else if ($this_field.is('.set')) {
$test_element = $(g.cEdit).find('select');
this_field_params[field_name] = $test_element.map(function(){
return $(this).val();
}).get().join(",");
- } else {
+ } else if ($this_field.is('.relation, .enum')) {
// results from a drop-down
$test_element = $(g.cEdit).find('select');
if ($test_element.length != 0) {
@@ -1246,6 +1273,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
if ($test_element.length != 0) {
this_field_params[field_name] = $test_element.text();
}
+ } else if ($this_field.is('.datefield, .datetimefield, .timestampfield')) {
+ this_field_params[field_name] = $(g.cEdit).find('input[type=text]').val();
+ } else {
+ this_field_params[field_name] = $(g.cEdit).find('textarea').val();
}
if (g.wasEditedCellNull || this_field_params[field_name] != PMA_getCellValue(g.currentEditCell)) {
need_to_post = true;
@@ -1545,6 +1576,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
e.preventDefault();
}
});
+ $(g.cEdit).find('.edit_area').click(function(e) {
+ e.stopPropagation();
+ });
$('html').click(function(e) {
// hide edit cell if the click is not from g.cEdit
if ($(e.target).parents().index(g.cEdit) == -1) {
diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php
index 93f5ecfc6d..840e611a97 100644
--- a/libraries/Theme_Manager.class.php
+++ b/libraries/Theme_Manager.class.php
@@ -235,9 +235,11 @@ class PMA_Theme_Manager
if ($handleThemes = opendir($this->getThemesPath())) {
// check for themes directory
while (false !== ($PMA_Theme = readdir($handleThemes))) {
+ // Skip non dirs, . and ..
+ if ($PMA_Theme == '.' || $PMA_Theme == '..' || ! is_dir($this->getThemesPath() . '/' . $PMA_Theme)) {
+ continue;
+ }
if (array_key_exists($PMA_Theme, $this->themes)) {
- // this does nothing!
- //$this->themes[$PMA_Theme] = $this->themes[$PMA_Theme];
continue;
}
$new_theme = PMA_Theme::load($this->getThemesPath() . '/' . $PMA_Theme);
@@ -323,8 +325,8 @@ class PMA_Theme_Manager
/**
* load layout file if exists
*/
- if (@file_exists($GLOBALS['pmaThemePath'] . 'layout.inc.php')) {
- include $GLOBALS['pmaThemePath'] . 'layout.inc.php';
+ if (file_exists($this->theme->getLayoutFile())) {
+ include $this->theme->getLayoutFile();
}
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 3ec67e5672..4baa65fbd0 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1411,11 +1411,19 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
$hide_class = ($col_visib && !$col_visib[$j] &&
// hide per only if the display direction is not vertical
$_SESSION['tmp_user_values']['disp_direction'] != 'vertical') ? 'hide' : '';
+ // handle datetime-related class, for grid editing
+ if (substr($meta->type, 0, 9) == 'timestamp' || $meta->type == 'datetime') {
+ $field_type_class = 'datetimefield';
+ } else if ($meta->type == 'date') {
+ $field_type_class = 'datefield';
+ } else {
+ $field_type_class = '';
+ }
$pointer = $i;
$is_field_truncated = false;
//If the previous column had blob data, we need to reset the class
// to $inline_edit_class
- $class = 'data ' . $grid_edit_class . ' ' . $not_null_class . ' ' . $relation_class . ' ' . $hide_class; //' ' . $alternating_color_class .
+ $class = 'data ' . $grid_edit_class . ' ' . $not_null_class . ' ' . $relation_class . ' ' . $hide_class . ' ' . $field_type_class; //' ' . $alternating_color_class .
// See if this column should get highlight because it's used in the
// where-query.
diff --git a/sql.php b/sql.php
index 60740f6448..6e5a05d82f 100644
--- a/sql.php
+++ b/sql.php
@@ -15,6 +15,7 @@ require_once './libraries/check_user_privileges.lib.php';
require_once './libraries/bookmark.lib.php';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/timepicker.js';
$GLOBALS['js_include'][] = 'tbl_change.js';
if (isset($_SESSION['profiling'])) {
diff --git a/test/classes/Advisor_test.php b/test/classes/Advisor_test.php
index d2be7741a5..9a92fe5614 100644
--- a/test/classes/Advisor_test.php
+++ b/test/classes/Advisor_test.php
@@ -96,7 +96,7 @@ class Advisor_test extends PHPUnit_Framework_TestCase
array(
array('justification' => 'foo | fsafdsa', 'name' => 'Failure', 'issue' => 'issue', 'recommendation' => 'Recommend'),
array(),
- 'Failed formattingstring for rule \'Failure\'. PHP threw following error: Use of undefined constant fsafdsa - assumed \'fsafdsa\'',
+ 'Failed formatting string for rule \'Failure\'. PHP threw following error: Use of undefined constant fsafdsa - assumed \'fsafdsa\'',
),
);
}
diff --git a/test/test_data/exploit_test.sql b/test/test_data/exploit_test.sql
index dce733ff4c..6ac7fba4b3 100644
--- a/test/test_data/exploit_test.sql
+++ b/test/test_data/exploit_test.sql
@@ -16,9 +16,9 @@ SET time_zone = "+00:00";
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8 */;
-DROP DATABASE `">`;
-DROP DATABASE `'>`;
-DROP DATABASE `exploit_test`;
+DROP DATABASE IF EXISTS `">`;
+DROP DATABASE IF EXISTS `'>`;
+DROP DATABASE IF EXISTS `exploit_test`;
--
-- Database: `">`
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 83590f927d..64e64e49a7 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -2533,3 +2533,9 @@ span.cm-number {
padding-left: 20px;
}
+/* css for timepicker */
+.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 0 10px 65px; }
+.ui-timepicker-div td { font-size: 90%; }
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 805041939e..982e744a7d 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -2974,3 +2974,9 @@ span.cm-number {
padding-left: 20px;
}
+/* css for timepicker */
+.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 0 10px 65px; }
+.ui-timepicker-div td { font-size: 90%; }
|