Compare commits

...

44 Commits

Author SHA1 Message Date
Trent Richardson 5eb540282f Ready for deployment 2012-02-11 17:34:50 -05:00
Trent Richardson 19fa33319a he fix by erann3 2012-02-07 11:03:50 -05:00
Trent Richardson e9ac8bf8cf Korean by Genie 2012-02-07 10:56:46 -05:00
Trent Richardson 27a426e3eb Create public $.datepicker.formatTime method 2012-02-07 10:52:19 -05:00
Trent e2faad1db2 Trim formatted time for when ampm=false and tt in format 2012-01-30 15:49:09 -05:00
Trent 547e6adde3 timeFormat tt h:mm not parsed fix by clear00 2012-01-30 15:32:35 -05:00
Trent fc2531ff86 Merge branch 'master' of github.com:trentrichardson/jQuery-Timepicker-Addon into dev 2012-01-18 07:49:32 -05:00
Trent 1b96a3f1d2 Fix more semicolons 2012-01-11 11:38:28 -05:00
Trent f1e4a47170 Fix semicolons 2012-01-11 11:34:44 -05:00
Trent 4853a89b9d Fix beforeShow to return value - by kunalkumar 2011-12-27 15:18:26 -05:00
Trent 26776afeb2 Update Russian translation by Sanek 2011-12-19 10:12:49 -05:00
Trent Richardson 1a1526287a Merge pull request #284 from RichardBradley/dev
Fix error parsing date when setting option defaultDate
2011-12-15 08:27:25 -08:00
Richard Bradley 8e456626c7 bug fix - swallowing all date parsing errors breaks the datepicker option "defaultDate" on relative values like "-18y" 2011-12-15 15:33:22 +00:00
Trent 3ac151fe8c Check for tp_inst in gotoToday 2011-12-14 08:13:01 -05:00
Trent 0ec258f82b Added Norwegian translation 2011-12-06 10:57:13 -05:00
Trent Richardson 9af6f920e8 Fix option setter 2011-12-04 11:28:14 -05:00
Trent Richardson 0a68b5c5dc Merge pull request #278 from tomaswindsor/patch-1
Fixes option setter override so it doesn't break option getter.
2011-12-04 08:24:43 -08:00
Tomáš Windsor 21bcc3c07b Fixes option setter override so it doesn't break option getter. 2011-12-04 16:02:41 +01:00
Trent Richardson dc15bf6bc5 sliderAccess tweak 2011-12-04 09:48:06 -05:00
Trent Richardson ac38588138 sliderAccess tweak 2011-12-04 09:45:23 -05:00
Trent Richardson 9963f68ad5 Create new dev version 2011-12-03 15:26:14 -05:00
Trent Richardson cc45f6a6d8 Merge branch 'master' of github.com:trentrichardson/jQuery-Timepicker-Addon 2011-12-03 15:23:22 -05:00
Trent Richardson fc06b3fb2c Update Version 2011-12-03 15:10:50 -05:00
Trent Richardson 8c862700ca Prepare version update 2011-12-03 15:08:43 -05:00
Trent f7eafa9849 Adj grids only when slideAccess visible 2011-12-02 13:44:58 -05:00
Trent fab4a4428a Fix decimals results 2011-12-02 12:19:41 -05:00
Trent f9a9344e67 Fix grids with sliderAccess 2011-12-02 12:07:15 -05:00
Trent f4ace05108 Add sliderAccess integration 2011-12-02 11:05:04 -05:00
Trent 9a19d875ee refactor markup generation; add change event 2011-12-01 14:17:48 -05:00
Trent 97e6641ed8 Update Turkish translation by Goktug Ozturk 2011-11-23 11:36:51 -05:00
Trent 5b1a9af999 Added Swedish localization by Nevon 2011-11-01 09:05:01 -04:00
Trent f1b0f2cb1f Add translation by lalaships 2011-10-21 09:11:47 -04:00
Trent c75ff1c40c Fixes issue 254, 261 _updateDateTime 2011-10-18 10:08:49 -04:00
Trent 73adb692d0 Simplified Chinese by Will-Lu 2011-10-18 09:00:10 -04:00
Trent 5ee53c21b1 Fix daylight savings by mliberato 2011-10-18 08:53:32 -04:00
Trent Richardson fc29bd7277 Merge pull request #259 from inerdia/dev
Finished the Slovak localisation in the dev branch
2011-10-18 05:42:21 -07:00
Trent Richardson cc2b4dd91d Merge pull request #262 from davidbarral/dev
Added Galician translation
2011-10-18 05:40:57 -07:00
David Barral 52d21bd0fd Added Galician translation 2011-10-18 13:38:34 +02:00
David Vallner 20b0c0845f Fix Slovak localisation and add AM/PM markers 2011-10-13 01:47:44 +02:00
Trent ff6596d673 Fix localization 2011-10-03 16:50:41 -04:00
Trent e14e636698 Fix localization 2011-10-03 16:48:07 -04:00
Trent Richardson fae432b17d Updated Last Mod Date 2011-10-02 09:52:31 -04:00
Trent Richardson 4106d5e3b6 Create new dev version 2011-10-02 09:51:22 -04:00
Trent Richardson 9448760924 Change version 2011-10-02 09:45:01 -04:00
13 changed files with 288 additions and 118 deletions

View File

@ -1,6 +1,6 @@
.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 dl dt { height: 25px; margin-bottom: -25px; }
.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
.ui-timepicker-div td { font-size: 90%; }
.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }

View File

@ -1,10 +1,10 @@
/*
* jQuery timepicker addon
* By: Trent Richardson [http://trentrichardson.com]
* Version 0.9.7-dev
* Last Modified: 07/23/2011
* Version 0.9.9
* Last Modified: 02/05/2012
*
* Copyright 2011 Trent Richardson
* Copyright 2012 Trent Richardson
* Dual licensed under the MIT and GPL licenses.
* http://trentrichardson.com/Impromptu/GPL-LICENSE.txt
* http://trentrichardson.com/Impromptu/MIT-LICENSE.txt
@ -12,15 +12,15 @@
* 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 dl dt { height: 25px; margin-bottom: -25px; }
* .ui-timepicker-div dl dd { margin: 0 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" } });
$.extend($.ui, { timepicker: { version: "0.9.9" } });
/* Time picker manager.
Use the singleton instance of this class, $.timepicker, to interact with the time picker.
@ -54,10 +54,10 @@ function Timepicker() {
showMillisec: false,
showTimezone: false,
showTime: true,
stepHour: 0.05,
stepMinute: 0.05,
stepSecond: 0.05,
stepMillisec: 0.5,
stepHour: 1,
stepMinute: 1,
stepSecond: 1,
stepMillisec: 1,
hour: 0,
minute: 0,
second: 0,
@ -83,10 +83,12 @@ function Timepicker() {
altFieldTimeOnly: true,
showTimepicker: true,
timezoneIso8609: false,
timezoneList: null
timezoneList: null,
addSliderAccess: false,
sliderAccessArgs: null
};
$.extend(this._defaults, this.regional['']);
}
};
$.extend(Timepicker.prototype, {
$input: null,
@ -145,7 +147,7 @@ $.extend(Timepicker.prototype, {
tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, o, {
beforeShow: function(input, dp_inst) {
if ($.isFunction(o.beforeShow))
o.beforeShow(input, dp_inst, tp_inst);
return 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.
@ -245,7 +247,7 @@ $.extend(Timepicker.prototype, {
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;
regstr = '^.{' + dp_dateFormat.length + ',}?' + this._defaults.separator.replace(specials, "\\$&") + regstr;
}
treg = timeString.match(new RegExp(regstr, 'i'));
@ -341,10 +343,10 @@ $.extend(Timepicker.prototype, {
// Added by Peter Medeiros:
// - Figure out what the hour/minute/second max should be based on the step values.
// - Example: if stepMinute is 15, then minMax is 45.
hourMax = (o.hourMax - ((o.hourMax - o.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),
hourMax = parseInt((o.hourMax - ((o.hourMax - o.hourMin) % o.stepHour)) ,10),
minMax = parseInt((o.minuteMax - ((o.minuteMax - o.minuteMin) % o.stepMinute)) ,10),
secMax = parseInt((o.secondMax - ((o.secondMax - o.secondMin) % o.stepSecond)) ,10),
millisecMax = parseInt((o.millisecMax - ((o.millisecMax - o.millisecMin) % o.stepMillisec)) ,10),
dp_id = this.inst.id.toString().replace(/([^A-Za-z0-9_])/g, '');
// Prevent displaying twice
@ -365,10 +367,10 @@ $.extend(Timepicker.prototype, {
size;
// Hours
html += '<dd class="ui_tpicker_hour"><div id="ui_tpicker_hour_' + dp_id + '"' +
((o.showHour) ? '' : noDisplay) + '></div>';
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>';
html += '<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++;
@ -382,70 +384,63 @@ $.extend(Timepicker.prototype, {
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>';
html += '</tr></table></div>';
}
html += '</dd>';
// Minutes
html += '<dt class="ui_tpicker_minute_label" id="ui_tpicker_minute_label_' + dp_id + '"' +
((o.showMinute) ? '' : noDisplay) + '>' + o.minuteText + '</dt>'+
'<dd class="ui_tpicker_minute"><div id="ui_tpicker_minute_' + dp_id + '"' +
((o.showMinute) ? '' : noDisplay) + '></div>';
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>';
html += '<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>';
html += '</tr></table></div>';
}
html += '</dd>';
// Seconds
html += '<dt class="ui_tpicker_second_label" id="ui_tpicker_second_label_' + dp_id + '"' +
((o.showSecond) ? '' : noDisplay) + '>' + o.secondText + '</dt>';
((o.showSecond) ? '' : noDisplay) + '>' + o.secondText + '</dt>'+
'<dd class="ui_tpicker_second"><div id="ui_tpicker_second_' + dp_id + '"'+
((o.showSecond) ? '' : noDisplay) + '></div>';
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>';
html += '<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>';
html += '</tr></table></div>';
}
html += '</dd>';
// Milliseconds
html += '<dt class="ui_tpicker_millisec_label" id="ui_tpicker_millisec_label_' + dp_id + '"' +
((o.showMillisec) ? '' : noDisplay) + '>' + o.millisecText + '</dt>';
((o.showMillisec) ? '' : noDisplay) + '>' + o.millisecText + '</dt>'+
'<dd class="ui_tpicker_millisec"><div id="ui_tpicker_millisec_' + dp_id + '"'+
((o.showMillisec) ? '' : noDisplay) + '></div>';
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>';
html += '<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 += '<td>' + ((l < 10) ? '0' : '') + l + '</td>';
}
html += '</tr></table></div>' +
'</dd>';
} else html += '<dd class="ui_tpicker_millisec" id="ui_tpicker_millisec_' + dp_id + '"' +
((o.showMillisec) ? '' : noDisplay) + '></dd>';
html += '</tr></table></div>';
}
html += '</dd>';
// Timezone
html += '<dt class="ui_tpicker_timezone_label" id="ui_tpicker_timezone_label_' + dp_id + '"' +
@ -477,6 +472,7 @@ $.extend(Timepicker.prototype, {
}
});
// Updated by Peter Medeiros:
// - Pass in Event and UI instance into slide function
this.minute_slider = $tp.find('#ui_tpicker_minute_'+ dp_id).slider({
@ -486,7 +482,6 @@ $.extend(Timepicker.prototype, {
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();
}
@ -639,6 +634,32 @@ $.extend(Timepicker.prototype, {
this.minute_slider.bind('slidestop',onSelectDelegate);
this.second_slider.bind('slidestop',onSelectDelegate);
this.millisec_slider.bind('slidestop',onSelectDelegate);
// slideAccess integration: http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/
if (this._defaults.addSliderAccess){
var sliderAccessArgs = this._defaults.sliderAccessArgs;
setTimeout(function(){ // fix for inline mode
if($tp.find('.ui-slider-access').length == 0){
$tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs);
// fix any grids since sliders are shorter
var sliderAccessWidth = $tp.find('.ui-slider-access:eq(0)').outerWidth(true);
if(sliderAccessWidth){
$tp.find('table:visible').each(function(){
var $g = $(this),
oldWidth = $g.outerWidth(),
oldMarginLeft = $g.css('marginLeft').toString().replace('%',''),
newWidth = oldWidth - sliderAccessWidth,
newMarginLeft = ((oldMarginLeft * newWidth)/oldWidth) + '%';
$g.css({ width: newWidth, marginLeft: newMarginLeft });
});
}
}
},0);
}
// end slideAccess integration
}
},
@ -732,10 +753,10 @@ $.extend(Timepicker.prototype, {
}
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);
var hourMax = parseInt((this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)) ,10),
minMax = parseInt((this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)) ,10),
secMax = parseInt((this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)) ,10),
millisecMax = parseInt((this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)) ,10);
if(this.hour_slider)
this.hour_slider.slider("option", { min: this._defaults.hourMin, max: hourMax }).slider('value', this.hour);
@ -797,7 +818,8 @@ $.extend(Timepicker.prototype, {
}
if (o.ampm) this.ampm = ampm;
this._formatTime();
//this._formatTime();
this.formattedTime = $.datepicker.formatTime(this._defaults.timeFormat, this, this._defaults);
if (this.$timeObj) this.$timeObj.text(this.formattedTime + o.timeSuffix);
this.timeDefined = true;
if (hasChanged) this._updateDateTime();
@ -816,41 +838,14 @@ $.extend(Timepicker.prototype, {
},
//########################################################################
// format the time all pretty...
// left for any backwards compatibility
//########################################################################
_formatTime: function(time, format, ampm) {
if (ampm == undefined) ampm = this._defaults.ampm;
_formatTime: function(time, format) {
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 '';
}
});
tmptime = $.datepicker.formatTime(tmptime, time, this._defaults);
if (arguments.length) return tmptime;
else this.formattedTime = tmptime;
},
@ -859,8 +854,8 @@ $.extend(Timepicker.prototype, {
// 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),
dp_inst = this.inst || dp_inst;
var dt = $.datepicker._daylightSavingAdjust(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;
@ -934,6 +929,54 @@ $.fn.extend({
}
});
//########################################################################
// format the time all pretty...
// format = string format of the time
// time = a {}, not a Date() for timezones
// options = essentially the regional[].. amNames, pmNames, ampm
//########################################################################
$.datepicker.formatTime = function(format, time, options) {
options = options || {};
options = $.extend($.timepicker._defaults, options);
time = $.extend({hour:0, minute:0, second:0, millisec:0, timezone:'+0000'}, time);
var tmptime = format;
var ampmName = options['amNames'][0];
var hour = parseInt(time.hour, 10);
if (options.ampm) {
if (hour > 11){
ampmName = options['pmNames'][0];
if(hour > 12)
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 (options.ampm) {
if (match.length == 1)
ampmName = ampmName.charAt(0);
return match.charAt(0) == 'T' ? ampmName.toUpperCase() : ampmName.toLowerCase();
}
return '';
}
});
tmptime = $.trim(tmptime);
return tmptime;
}
//########################################################################
// 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
@ -1048,11 +1091,11 @@ $.datepicker._gotoToday = function(id) {
this._base_gotoToday(id);
var now = new Date();
var tp_inst = this._get(inst, 'timepicker');
if (tp_inst._defaults.showTimezone && tp_inst.timezone_select) {
if (tp_inst && 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
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);
@ -1186,10 +1229,15 @@ $.datepicker.parseDate = function(format, value, settings) {
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);
if (err.indexOf(":") >= 0) {
// 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);
} else {
// The underlying error was not related to the time
throw err;
}
}
return date;
};
@ -1204,11 +1252,11 @@ $.datepicker._formatDate = function(inst, day, month, year){
{
if(day)
var b = this._base_formatDate(inst, day, month, year);
tp_inst._updateDateTime();
tp_inst._updateDateTime(inst);
return tp_inst.$input.val();
}
return this._base_formatDate(inst);
}
};
//#######################################################################################
// override options setter to add time to maxDate(Time) and minDate(Time). MaxDate
@ -1255,7 +1303,9 @@ $.datepicker._optionDatepicker = function(target, name, value) {
else if (onselect)
tp_inst._defaults.onSelect=onselect;
}
this._base_optionDatepicker(target, name, value);
if (value === undefined)
return this._base_optionDatepicker(target, name);
return this._base_optionDatepicker(target, name, value);
};
//#######################################################################################
@ -1267,10 +1317,10 @@ function extendRemove(target, props) {
if (props[name] === null || props[name] === undefined)
target[name] = props[name];
return target;
}
};
$.timepicker = new Timepicker(); // singleton instance
$.timepicker.version = "0.9.7";
$.timepicker.version = "0.9.9";
})(jQuery);

20
localization/jquery-ui-timepicker-gl.js vendored Normal file
View File

@ -0,0 +1,20 @@
/* Galician translation for the jQuery Timepicker Addon */
/* Written by David Barral */
(function($) {
$.timepicker.regional['gl'] = {
timeOnlyTitle: 'Elixir unha hora',
timeText: 'Hora',
hourText: 'Horas',
minuteText: 'Minutos',
secondText: 'Segundos',
millisecText: 'Milisegundos',
timezoneText: 'Fuso horario',
currentText: 'Agora',
closeText: 'Pechar',
timeFormat: 'hh:mm',
amNames: ['a.m.', 'AM', 'A'],
pmNames: ['p.m.', 'PM', 'P'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['gl']);
})(jQuery);

View File

@ -2,7 +2,7 @@
/* Written by Lior Lapid */
(function($) {
$.timepicker.regional["he"] = {
timeOnlyTitle: "בחרית זמן",
timeOnlyTitle: "בחירת זמן",
timeText: "שעה",
hourText: "שעות",
minuteText: "דקות",

20
localization/jquery-ui-timepicker-ko.js vendored Normal file
View File

@ -0,0 +1,20 @@
/* Korean translation for the jQuery Timepicker Addon */
/* Written by Genie */
(function($) {
$.timepicker.regional['ko'] = {
timeOnlyTitle: '시간 선택',
timeText: '시간',
hourText: '시',
minuteText: '분',
secondText: '초',
millisecText: '밀리초',
timezoneText: '표준 시간대',
currentText: '현재 시각',
closeText: '닫기',
timeFormat: 'tt h:mm',
amNames: ['오전', 'AM', 'A'],
pmNames: ['오후', 'PM', 'P'],
ampm: true
};
$.timepicker.setDefaults($.timepicker.regional['ko']);
})(jQuery);

20
localization/jquery-ui-timepicker-no.js vendored Normal file
View File

@ -0,0 +1,20 @@
/* Norwegian translation for the jQuery Timepicker Addon */
/* Written by Morten Hauan (http://hauan.me) */
(function($) {
$.timepicker.regional['no'] = {
timeOnlyTitle: 'Velg tid',
timeText: 'Tid',
hourText: 'Time',
minuteText: 'Minutt',
secondText: 'Sekund',
millisecText: 'Millisekund',
timezoneText: 'Tidssone',
currentText: 'Nå',
closeText: 'Lukk',
timeFormat: 'hh:mm',
amNames: ['am', 'AM', 'A'],
pmNames: ['pm', 'PM', 'P'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['no']);
})(jQuery);

View File

@ -8,7 +8,7 @@
minuteText: 'Minutos',
secondText: 'Segundos',
millisecText: 'Milissegundos',
timezoneText: 'Fuso hor&aacute;rio',
timezoneText: 'Fuso horário',
currentText: 'Agora',
closeText: 'Fechar',
timeFormat: 'hh:mm',

View File

@ -8,8 +8,8 @@
minuteText: 'Минуты',
secondText: 'Секунды',
millisecText: 'Миллисекунды',
timezoneText: 'Время зоны',
currentText: 'Теперь',
timezoneText: 'Часовой пояс',
currentText: 'Сейчас',
closeText: 'Закрыть',
timeFormat: 'hh:mm tt',
amNames: ['AM', 'A'],

View File

@ -5,15 +5,15 @@
timeOnlyTitle: 'Zvoľte čas',
timeText: 'Čas',
hourText: 'Hodiny',
minuteText: 'Minuty',
minuteText: 'Minúty',
secondText: 'Sekundy',
millisecText: 'Milisekundy',
timezoneText: 'Časové pásmo',
currentText: 'Teraz',
closeText: 'Zavřít',
closeText: 'Zavrieť',
timeFormat: 'h:m',
amNames: ['dop.', 'AM', 'A'],
pmNames: ['odp.', 'PM', 'P'],
pmNames: ['pop.', 'PM', 'P'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['sk']);

20
localization/jquery-ui-timepicker-sv.js vendored Normal file
View File

@ -0,0 +1,20 @@
/* Swedish translation for the jQuery Timepicker Addon */
/* Written by Nevon */
(function($) {
$.timepicker.regional['sv'] = {
timeOnlyTitle: 'Välj en tid',
timeText: 'Timme',
hourText: 'Timmar',
minuteText: 'Minuter',
secondText: 'Sekunder',
millisecText: 'Millisekunder',
timezoneText: 'Tidszon',
currentText: 'Nu',
closeText: 'Stäng',
timeFormat: 'hh:mm',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['sv']);
})(jQuery);

View File

@ -1,5 +1,5 @@
/* Turkish translation for the jQuery Timepicker Addon */
/* Written by Fehmi Can Saglam */
/* Written by Fehmi Can Saglam, Edited by Goktug Ozturk */
(function($) {
$.timepicker.regional['tr'] = {
timeOnlyTitle: 'Zaman Seçiniz',
@ -7,13 +7,13 @@
hourText: 'Saat',
minuteText: 'Dakika',
secondText: 'Saniye',
millisecText: 'Milisaniyelik',
millisecText: 'Milisaniye',
timezoneText: 'Zaman Dilimi',
currentText: 'Şu an',
closeText: 'Tamam',
timeFormat: 'hh:mm',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
amNames: ['ÖÖ', '],
pmNames: ['ÖS', 'S'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['tr']);

View File

@ -0,0 +1,20 @@
/* Simplified Chinese translation for the jQuery Timepicker Addon /
/ Written by Will Lu */
(function($) {
$.timepicker.regional['zh-CN'] = {
timeOnlyTitle: '选择时间',
timeText: '时间',
hourText: '小时',
minuteText: '分钟',
secondText: '秒钟',
millisecText: '微秒',
timezoneText: '时区',
currentText: '现在时间',
closeText: '关闭',
timeFormat: 'hh:mm',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['zh-CN']);
})(jQuery);

View File

@ -0,0 +1,20 @@
/* Chinese translation for the jQuery Timepicker Addon */
/* Written by Alang.lin */
(function($) {
$.timepicker.regional['zh-TW'] = {
timeOnlyTitle: '選擇時分秒',
timeText: '時間',
hourText: '時',
minuteText: '分',
secondText: '秒',
millisecText: '毫秒',
timezoneText: '時區',
currentText: '現在時間',
closeText: '確定',
timeFormat: 'hh:mm tt',
amNames: ['上午', 'AM', 'A'],
pmNames: ['下午', 'PM', 'P'],
ampm: false
};
$.timepicker.setDefaults($.timepicker.regional['zh-TW']);
})(jQuery);