deac/jQuery-Timepicker-Addon
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added separator to formatted time output

Browse source
This commit is contained in:
Trent Richardson 2010-12-17 09:07:11 -05:00
parent b4805d6dcc
commit b394ee84ed
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
jquery-ui-timepicker-addon.js vendored
View file

@ -2,7 +2,7 @@
* jQuery timepicker addon * jQuery timepicker addon
* By: Trent Richardson [http://trentrichardson.com] * By: Trent Richardson [http://trentrichardson.com]
* Version 0.9.2-dev * Version 0.9.2-dev
* Last Modified: 12/13/2010 by Charles Phillips * Last Modified: 12/17/2010
* *
* Copyright 2010 Trent Richardson * Copyright 2010 Trent Richardson
* Dual licensed under the MIT and GPL licenses. * Dual licensed under the MIT and GPL licenses.
@ -58,10 +58,8 @@ function Timepicker() {
hourMax: 23, hourMax: 23,
minuteMax: 59, minuteMax: 59,
secondMax: 59, secondMax: 59,
minDateTime: null, minDateTime: null,
maxDateTime: null, maxDateTime: null,
hourGrid: 0, hourGrid: 0,
minuteGrid: 0, minuteGrid: 0,
secondGrid: 0, secondGrid: 0,
@ -185,7 +183,7 @@ $.extend(Timepicker.prototype, {
// the time should come after x number of characters and a space. // the time should come after x number of characters and a space.
// x = at least the length of text specified by the date format // x = at least the length of text specified by the date format
var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat'); var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
regstr = '.{' + dp_dateFormat.length + ',}\\s*?' + regstr; regstr = '.{' + dp_dateFormat.length + ',}\\s*' + regstr;
} }
treg = timeString.match(new RegExp(regstr, 'i')); treg = timeString.match(new RegExp(regstr, 'i'));
@ -598,7 +596,6 @@ $.extend(Timepicker.prototype, {
if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0)) if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0))
return; return;
<<<<<<< HEAD
if (this._defaults.timeOnly === true) { if (this._defaults.timeOnly === true) {
formattedDateTime = this.formattedTime; formattedDateTime = this.formattedTime;
if (this.$altInput) { if (this.$altInput) {
@ -607,18 +604,12 @@ $.extend(Timepicker.prototype, {
} else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) { } else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) {
if (this.$altInput) { if (this.$altInput) {
if (this._defaults.timeOnly !== true) { if (this._defaults.timeOnly !== true) {
this.$altInput.val(this.$altInput.val() + ' ' + this.formattedTime); this.$altInput.val(this.$altInput.val() + this._defaults.separator + this.formattedTime);
} else { } else {
this.$altInput.val(this.formattedDateTime); this.$altInput.val(this.formattedDateTime);
} }
} }
formattedDateTime += ' ' + this.formattedTime; formattedDateTime += this._defaults.separator + this.formattedTime;
=======
if (this._defaults.timeOnly === true) formattedDateTime = this.formattedTime;
else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) {
if (this.$altInput) this.$altInput.val(this.formattedTime);
else formattedDateTime += this._defaults.separator + this.formattedTime;
>>>>>>> michael-simons-master
} }
this.formattedDateTime = formattedDateTime; this.formattedDateTime = formattedDateTime;