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

Merge pull request #167 from alexandergitter/dev

Browse source 
Add new regional setting timeSuffix
This commit is contained in:
Trent Richardson 2011-05-30 18:10:34 -07:00
parent 30f54c8e8a 1a50d4f402
commit 2aa96ed044
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,7 @@ function Timepicker() {
closeText: 'Done', closeText: 'Done',
ampm: false, ampm: false,
timeFormat: 'hh:mm tt', timeFormat: 'hh:mm tt',
timeSuffix: '',
timeOnlyTitle: 'Choose Time', timeOnlyTitle: 'Choose Time',
timeText: 'Time', timeText: 'Time',
hourText: 'Hour', hourText: 'Hour',
@ -198,7 +199,7 @@ $.extend(Timepicker.prototype, {
.replace(/s{1,2}/ig, '(\\d?\\d)') .replace(/s{1,2}/ig, '(\\d?\\d)')
.replace(/t{1,2}/ig, '(am|pm|a|p)?') .replace(/t{1,2}/ig, '(am|pm|a|p)?')
.replace(/z{1}/ig, '((\\+|-)\\d\\d\\d\\d)?') .replace(/z{1}/ig, '((\\+|-)\\d\\d\\d\\d)?')
.replace(/\s/g, '\\s?') + '$', .replace(/\s/g, '\\s?') + this._defaults.timeSuffix + '$',
order = this._getFormatPositions(), order = this._getFormatPositions(),
treg; treg;
@ -624,7 +625,7 @@ $.extend(Timepicker.prototype, {
if (this._defaults.ampm) this.ampm = ampm; if (this._defaults.ampm) this.ampm = ampm;
this._formatTime(); this._formatTime();
if (this.$timeObj) this.$timeObj.text(this.formattedTime); if (this.$timeObj) this.$timeObj.text(this.formattedTime + this._defaults.timeSuffix);
this.timeDefined = true; this.timeDefined = true;
if (hasChanged) this._updateDateTime(); if (hasChanged) this._updateDateTime();
}, },
@ -699,7 +700,7 @@ $.extend(Timepicker.prototype, {
if (this._defaults.timeOnly === true) { if (this._defaults.timeOnly === true) {
formattedDateTime = this.formattedTime; formattedDateTime = this.formattedTime;
} else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) { } else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) {
formattedDateTime += this._defaults.separator + this.formattedTime; formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
} }
this.formattedDateTime = formattedDateTime; this.formattedDateTime = formattedDateTime;
@ -774,7 +775,7 @@ $.datepicker._selectDate = function (id, dateStr) {
tp_inst._limitMinMaxDateTime(inst, true); tp_inst._limitMinMaxDateTime(inst, true);
inst.inline = inst.stay_open = true; inst.inline = inst.stay_open = true;
//This way the onSelect handler called from calendarpicker get the full dateTime //This way the onSelect handler called from calendarpicker get the full dateTime
this._base_selectDate(id, dateStr + tp_inst._defaults.separator + tp_inst.formattedTime); this._base_selectDate(id, dateStr + tp_inst._defaults.separator + tp_inst.formattedTime + tp_inst._defaults.timeSuffix);
inst.inline = inst.stay_open = false; inst.inline = inst.stay_open = false;
this._notifyChange(inst); this._notifyChange(inst);
this._updateDatepicker(inst); this._updateDatepicker(inst);
@ -819,6 +820,7 @@ $.datepicker._doKeyPress = function(event) {
.replace(/t/g, ampm ? 'ap' : '') + .replace(/t/g, ampm ? 'ap' : '') +
" " + " " +
tp_inst._defaults.separator + tp_inst._defaults.separator +
tp_inst._defaults.timeSuffix +
$.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')), $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode); chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
return event.ctrlKey || (chr < ' ' || !datetimeChars || datetimeChars.indexOf(chr) > -1); return event.ctrlKey || (chr < ' ' || !datetimeChars || datetimeChars.indexOf(chr) > -1);