diff options
| author | Trent Richardson <trentdrichardson@gmail.com> | 2011-05-24 10:41:02 -0700 |
|---|---|---|
| committer | Trent Richardson <trentdrichardson@gmail.com> | 2011-05-24 10:41:02 -0700 |
| commit | 5ebb54b0e320b2c2f27f50b243286247853a3802 (patch) | |
| tree | 8fd14643400eb2a831caad5579b93e6b35a567c7 /jquery-ui-timepicker-addon.js | |
| parent | f9fee45d7b858d2f883f47bd418318a70c29ccc5 (diff) | |
| parent | e3c179dca188f3f300d566a94cff1af886cc6ed7 (diff) | |
| download | jQuery-Timepicker-Addon-5ebb54b0e320b2c2f27f50b243286247853a3802.zip jQuery-Timepicker-Addon-5ebb54b0e320b2c2f27f50b243286247853a3802.tar.gz jQuery-Timepicker-Addon-5ebb54b0e320b2c2f27f50b243286247853a3802.tar.bz2 | |
Merge pull request #162 from bistory/dev
Added French translation
Diffstat (limited to 'jquery-ui-timepicker-addon.js')
| -rw-r--r-- | jquery-ui-timepicker-addon.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index c22a5ad..0e3783f 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -1,7 +1,7 @@ /* * jQuery timepicker addon * By: Trent Richardson [http://trentrichardson.com] -* Version 0.9.4 +* Version 0.9.5-dev * Last Modified: 05/12/2011 * * Copyright 2011 Trent Richardson @@ -501,7 +501,7 @@ $.extend(Timepicker.prototype, { //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); @@ -601,7 +601,7 @@ $.extend(Timepicker.prototype, { 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 + timezone = (this.timezone_select) ? this.timezone_select.val() : false; if (hour !== false) hour = parseInt(hour,10); if (minute !== false) minute = parseInt(minute,10); @@ -660,6 +660,8 @@ $.extend(Timepicker.prototype, { .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()) @@ -810,6 +812,8 @@ $.datepicker._doKeyPress = function(event) { 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' : '') + @@ -958,7 +962,7 @@ $.datepicker._getDateDatepicker = function(target, noDefault) { if (tp_inst) { this._setDateFromField(inst, noDefault); var date = this._getDate(inst); - if (date && tp_inst._parseTime($(target).val(), true)) date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second); + 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); |