http://www.mediawiki.org/wiki/Special:Code/MediaWiki/99439
Revision: 99439
Author: jeroendedauw
Date: 2011-10-10 22:24:12 +0000 (Mon, 10 Oct 2011)
Log Message:
-----------
added contest end date field with jquery datetimepicker
Modified Paths:
--------------
trunk/extensions/Contest/Contest.i18n.php
trunk/extensions/Contest/Contest.php
trunk/extensions/Contest/includes/Contest.class.php
trunk/extensions/Contest/includes/ContestUtils.php
trunk/extensions/Contest/resources/contest.special.editcontest.js
trunk/extensions/Contest/specials/SpecialEditContest.php
Added Paths:
-----------
trunk/extensions/Contest/resources/jquery-ui-timepicker-addon.css
trunk/extensions/Contest/resources/jquery-ui-timepicker-addon.js
Modified: trunk/extensions/Contest/Contest.i18n.php
===================================================================
--- trunk/extensions/Contest/Contest.i18n.php 2011-10-10 22:02:24 UTC (rev
99438)
+++ trunk/extensions/Contest/Contest.i18n.php 2011-10-10 22:24:12 UTC (rev
99439)
@@ -85,6 +85,7 @@
'contest-edit-help' => 'Help page',
'contest-edit-signup' => 'Signup email page',
'contest-edit-reminder' => 'Reminder email page',
+ 'contest-edit-end' => 'Contest end',
'contest-edit-exists-already' => 'Note: you are editing an already
existing contest, not creating a new one.',
'contest-edit-submit' => 'Submit',
Modified: trunk/extensions/Contest/Contest.php
===================================================================
--- trunk/extensions/Contest/Contest.php 2011-10-10 22:02:24 UTC (rev
99438)
+++ trunk/extensions/Contest/Contest.php 2011-10-10 22:24:12 UTC (rev
99439)
@@ -151,8 +151,12 @@
$wgResourceModules['contest.special.editcontest'] = $moduleTemplate + array(
'scripts' => array(
- 'contest.special.editcontest.js'
+ 'jquery-ui-timepicker-addon.js',
+ 'contest.special.editcontest.js',
),
+ 'styles' => array(
+ 'jquery-ui-timepicker-addon.css',
+ ),
'messages' => array(
'contest-edit-delete',
'contest-edit-add-first',
@@ -163,7 +167,9 @@
'contest-edit-challenge-oneline',
),
'dependencies' => array(
- 'jquery.ui.button'
+ 'jquery.ui.button',
+ 'jquery.ui.slider',
+ 'jquery.ui.datepicker'
)
);
Modified: trunk/extensions/Contest/includes/Contest.class.php
===================================================================
--- trunk/extensions/Contest/includes/Contest.class.php 2011-10-10 22:02:24 UTC
(rev 99438)
+++ trunk/extensions/Contest/includes/Contest.class.php 2011-10-10 22:24:12 UTC
(rev 99439)
@@ -115,7 +115,7 @@
'id' => 'id',
'name' => 'str',
'status' => 'int',
- 'end' => 'int',
+ 'end' => 'str', // TS_MW
'rules_page' => 'str',
'opportunities' => 'str',
Modified: trunk/extensions/Contest/includes/ContestUtils.php
===================================================================
--- trunk/extensions/Contest/includes/ContestUtils.php 2011-10-10 22:02:24 UTC
(rev 99438)
+++ trunk/extensions/Contest/includes/ContestUtils.php 2011-10-10 22:24:12 UTC
(rev 99439)
@@ -53,6 +53,11 @@
$article = new Article( $title, 0 );
+ // Looks like the LinkEnd hook can be used here instead of
replaceRelativeLinks.
+ // The hook could just turn relative urls into absolute ones in
a nice way,
+ // but would reauire setting some global such as
$isContestEmailParse to true
+ // before the parse call and to false afterwards, which also is
not very nice.
+
global $wgParser;
return $wgParser->parse(
self::replaceRelativeLinks( $article->fetchContent() ),
Modified: trunk/extensions/Contest/resources/contest.special.editcontest.js
===================================================================
--- trunk/extensions/Contest/resources/contest.special.editcontest.js
2011-10-10 22:02:24 UTC (rev 99438)
+++ trunk/extensions/Contest/resources/contest.special.editcontest.js
2011-10-10 22:24:12 UTC (rev 99439)
@@ -159,6 +159,11 @@
} );
} );
+ $( '#contest-edit-end' ).datetimepicker( {
+ minDate: new Date(),
+ dateFormat: 'yy-mm-dd'
+ } );
+
} );
})( window.jQuery, window.mediaWiki );
Added: trunk/extensions/Contest/resources/jquery-ui-timepicker-addon.css
===================================================================
--- trunk/extensions/Contest/resources/jquery-ui-timepicker-addon.css
(rev 0)
+++ trunk/extensions/Contest/resources/jquery-ui-timepicker-addon.css
2011-10-10 22:24:12 UTC (rev 99439)
@@ -0,0 +1,6 @@
+/* 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%; }
\ No newline at end of file
Added: trunk/extensions/Contest/resources/jquery-ui-timepicker-addon.js
===================================================================
--- trunk/extensions/Contest/resources/jquery-ui-timepicker-addon.js
(rev 0)
+++ trunk/extensions/Contest/resources/jquery-ui-timepicker-addon.js
2011-10-10 22:24:12 UTC (rev 99439)
@@ -0,0 +1,1276 @@
+/*
+* jQuery timepicker addon
+* By: Trent Richardson [http://trentrichardson.com]
+* Version 0.9.7
+* Last Modified: 10/02/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%; }
+* .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding:
0; }
+*/
+
+(function($) {
+
+$.extend($.ui, { timepicker: { version: "0.9.7" } });
+
+/* 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,
+ 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
+ showButtonPanel: true,
+ timeOnly: false,
+ 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,
+ timezoneIso8609: false,
+ timezoneList: null
+ };
+ $.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,
+ 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: null,
+
+ /* 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.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;
+
+ if (o.altField)
+ 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());
+ 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(/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]);
+
+ 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) {
+ 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 (ampm == 'AM' && treg[order.h] == '12')
+ this.hour = 0; // 12am = 0 hour
+ 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.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;
+
+ }
+ 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}|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++)
+ 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.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
+ //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 = '<div class="ui-timepicker-div"
id="ui-timepicker-div-' + dp_id + '"><dl>' +
+ '<dt
class="ui_tpicker_time_label" id="ui_tpicker_time_label_' + dp_id + '"' +
+ ((o.showTime) ? '' : noDisplay)
+ '>' + o.timeText + '</dt>' +
+ '<dd class="ui_tpicker_time"
id="ui_tpicker_time_' + dp_id + '"' +
+ ((o.showTime) ? '' : noDisplay)
+ '></dd>' +
+ '<dt
class="ui_tpicker_hour_label" id="ui_tpicker_hour_label_' + dp_id + '"' +
+ ((o.showHour) ? '' : noDisplay)
+ '>' + o.hourText + '</dt>',
+ hourGridSize = 0,
+ minuteGridSize = 0,
+ secondGridSize = 0,
+ millisecGridSize = 0,
+ size;
+
+ // Hours
+ if (o.showHour && o.hourGrid > 0) {
+ html += '<dd class="ui_tpicker_hour">' +
+ '<div id="ui_tpicker_hour_' +
dp_id + '"' + ((o.showHour) ? '' : noDisplay) + '></div>' +
+ '<div style="padding-left:
1px"><table class="ui-tpicker-grid-label"><tr>';
+
+ 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;
+ if (o.ampm) {
+ if (h == 0) tmph = 12 +'a';
+ else if (h < 12) tmph += 'a';
+ else tmph += 'p';
+ }
+ html += '<td>' + tmph + '</td>';
+ }
+
+ html += '</tr></table></div>' +
+ '</dd>';
+ } else html += '<dd class="ui_tpicker_hour"
id="ui_tpicker_hour_' + dp_id + '"' +
+ ((o.showHour) ? '' :
noDisplay) + '></dd>';
+
+ html += '<dt class="ui_tpicker_minute_label"
id="ui_tpicker_minute_label_' + dp_id + '"' +
+ ((o.showMinute) ? '' : noDisplay) + '>'
+ o.minuteText + '</dt>';
+
+ // Minutes
+ if (o.showMinute && o.minuteGrid > 0) {
+ html += '<dd class="ui_tpicker_minute
ui_tpicker_minute_' + o.minuteGrid + '">' +
+ '<div id="ui_tpicker_minute_' +
dp_id + '"' +
+ ((o.showMinute) ? '' :
noDisplay) + '></div>' +
+ '<div style="padding-left:
1px"><table class="ui-tpicker-grid-label"><tr>';
+
+ for (var m = o.minuteMin; m <= minMax; m +=
parseInt(o.minuteGrid,10)) {
+ minuteGridSize++;
+ html += '<td>' + ((m < 10) ? '0' : '')
+ m + '</td>';
+ }
+
+ html += '</tr></table></div>' +
+ '</dd>';
+ } else html += '<dd class="ui_tpicker_minute"
id="ui_tpicker_minute_' + dp_id + '"' +
+ ((o.showMinute) ? '' :
noDisplay) + '></dd>';
+
+ // Seconds
+ html += '<dt class="ui_tpicker_second_label"
id="ui_tpicker_second_label_' + dp_id + '"' +
+ ((o.showSecond) ? '' : noDisplay) + '>'
+ o.secondText + '</dt>';
+
+ if (o.showSecond && o.secondGrid > 0) {
+ html += '<dd class="ui_tpicker_second
ui_tpicker_second_' + o.secondGrid + '">' +
+ '<div id="ui_tpicker_second_' +
dp_id + '"' +
+ ((o.showSecond) ? '' :
noDisplay) + '></div>' +
+ '<div style="padding-left:
1px"><table><tr>';
+
+ for (var s = o.secondMin; s <= secMax; s +=
parseInt(o.secondGrid,10)) {
+ secondGridSize++;
+ html += '<td>' + ((s < 10) ? '0' : '')
+ s + '</td>';
+ }
+
+ html += '</tr></table></div>' +
+ '</dd>';
+ } else html += '<dd class="ui_tpicker_second"
id="ui_tpicker_second_' + dp_id + '"' +
+ ((o.showSecond) ? '' :
noDisplay) + '></dd>';
+
+ // Milliseconds
+ html += '<dt class="ui_tpicker_millisec_label"
id="ui_tpicker_millisec_label_' + dp_id + '"' +
+ ((o.showMillisec) ? '' : noDisplay) +
'>' + o.millisecText + '</dt>';
+
+ if (o.showMillisec && o.millisecGrid > 0) {
+ html += '<dd class="ui_tpicker_millisec
ui_tpicker_millisec_' + o.millisecGrid + '">' +
+ '<div id="ui_tpicker_millisec_'
+ dp_id + '"' +
+ ((o.showMillisec) ? '' :
noDisplay) + '></div>' +
+ '<div style="padding-left:
1px"><table><tr>';
+
+ for (var l = o.millisecMin; l <= millisecMax; l
+= parseInt(o.millisecGrid,10)) {
+ millisecGridSize++;
+ html += '<td>' + ((l < 10) ? '0' : '')
+ s + '</td>';
+ }
+
+ html += '</tr></table></div>' +
+ '</dd>';
+ } else html += '<dd class="ui_tpicker_millisec"
id="ui_tpicker_millisec_' + dp_id + '"' +
+ ((o.showMillisec) ? ''
: noDisplay) + '></dd>';
+
+ // Timezone
+ html += '<dt class="ui_tpicker_timezone_label"
id="ui_tpicker_timezone_label_' + dp_id + '"' +
+ ((o.showTimezone) ? '' : noDisplay) +
'>' + o.timezoneText + '</dt>';
+ html += '<dd class="ui_tpicker_timezone"
id="ui_tpicker_timezone_' + dp_id + '"' +
+ ((o.showTimezone) ? ''
: noDisplay) + '></dd>';
+
+ html += '</dl></div>';
+ $tp = $(html);
+
+ // if we only want time picker...
+ if (o.timeOnly === true) {
+ $tp.prepend(
+ '<div class="ui-widget-header
ui-helper-clearfix ui-corner-all">' +
+ '<div
class="ui-datepicker-title">' + o.timeOnlyTitle + '</div>' +
+ '</div>');
+ $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.millisec_slider =
$tp.find('#ui_tpicker_millisec_'+ dp_id).slider({
+ orientation: "horizontal",
+ value: this.millisec,
+ min: o.millisecMin,
+ max: millisecMax,
+ step: o.stepMillisec,
+ slide: function(event, ui) {
+ tp_inst.millisec_slider.slider(
"option", "value", ui.value);
+ tp_inst._onTimeChange();
+ }
+ });
+
+ this.timezone_select =
$tp.find('#ui_tpicker_timezone_'+
dp_id).append('<select></select>').find("select");
+ $.fn.append.apply(this.timezone_select,
+ $.map(o.timezoneList, function(val, idx) {
+ return $("<option />")
+ .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'
+ });
+ });
+ }
+
+ 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);
+
+ 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.millisec_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 &&
$.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 ||
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()) {
+ 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.millisecMin =
minDateTime.getMilliseconds();
+ } else {
+ 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($.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()){
+ 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.millisecMax =
maxDateTime.getMilliseconds();
+ } else {
+ 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){
+ 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);
+ }
+
+ },
+
+
+
//########################################################################
+ // 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,
+ 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];
+
+ // 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 || 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 (o.ampm) this.ampm = ampm;
+
+ this._formatTime();
+ if (this.$timeObj) this.$timeObj.text(this.formattedTime +
o.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, millisec: this.millisec, ampm: this.ampm, timezone: this.timezone
};
+ var tmptime = (format || this._defaults.timeFormat).toString();
+
+ var hour = parseInt(time.hour, 10);
+ if (ampm) {
+ 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;
+ },
+
+
//########################################################################
+ // 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);
+ 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('') : '')
+
+
(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 < ' ' || !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) {
+ var inst = this._getInst($(id)[0]),
+ $dp = inst.dpDiv;
+ this._base_gotoToday(id);
+ 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();
+};
+
+//#######################################################################################
+// 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,
+ 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) || (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);
+ if (tp_inst.minute_slider)
tp_inst.minute_slider.slider('value', minute);
+ if (tp_inst.second_slider)
tp_inst.second_slider.slider('value', second);
+ if (tp_inst.millisec_slider)
tp_inst.millisec_slider.slider('value', millisec);
+
+ 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, tp_inst.millisec);
+ }
+ 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,
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!
+//#######################################################################################
+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.7";
+
+})(jQuery);
+
Modified: trunk/extensions/Contest/specials/SpecialEditContest.php
===================================================================
--- trunk/extensions/Contest/specials/SpecialEditContest.php 2011-10-10
22:02:24 UTC (rev 99438)
+++ trunk/extensions/Contest/specials/SpecialEditContest.php 2011-10-10
22:24:12 UTC (rev 99439)
@@ -205,9 +205,22 @@
'label-message' => 'contest-edit-reminder',
);
+ $fields['end'] = array (
+ 'type' => 'text',
+ 'label-message' => 'contest-edit-end',
+ 'id' => 'contest-edit-end',
+ 'size' => 15
+ );
+
if ( $contest !== false ) {
foreach ( $fields as $name => $data ) {
- $fields[$name]['default'] = $contest->getField(
$name );
+ $default = $contest->getField( $name );
+
+ if ( $name == 'end' ) {
+ $default = wfTimestamp( TS_DB, $default
);
+ }
+
+ $fields[$name]['default'] = $default;
}
}
@@ -247,6 +260,10 @@
$matches = array();
if ( preg_match( '/contest-(.+)/', $name, $matches ) ) {
+ if ( $matches[1] == 'end' ) {
+ $value = wfTimestamp( TS_MW, strtotime(
$value ) );
+ }
+
$fields[$matches[1]] = $value;
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs