diff options
| author | Trent Richardson <trentdrichardson@gmail.com> | 2013-05-01 16:32:00 -0400 |
|---|---|---|
| committer | Trent Richardson <trentdrichardson@gmail.com> | 2013-05-01 16:32:00 -0400 |
| commit | 97930a11c4928e172ff843b1ca64fe1c02501261 (patch) | |
| tree | 9a4eb57e8177a51d520bdd9e078e6508dc673144 | |
| parent | 7c60b2848a826684660c730cc9b16c8c6a3baca8 (diff) | |
| download | jQuery-Timepicker-Addon-97930a11c4928e172ff843b1ca64fe1c02501261.zip jQuery-Timepicker-Addon-97930a11c4928e172ff843b1ca64fe1c02501261.tar.gz jQuery-Timepicker-Addon-97930a11c4928e172ff843b1ca64fe1c02501261.tar.bz2 | |
Merges changes by Moreno - fixes Italian i18n and slider detection
| -rw-r--r-- | i18n/jquery-ui-timepicker-it.js | 8 | ||||
| -rw-r--r-- | jquery-ui-timepicker-addon.js | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/i18n/jquery-ui-timepicker-it.js b/i18n/jquery-ui-timepicker-it.js index 5e80224..ea976fd 100644 --- a/i18n/jquery-ui-timepicker-it.js +++ b/i18n/jquery-ui-timepicker-it.js @@ -5,10 +5,10 @@ timeOnlyTitle: 'Scegli orario', timeText: 'Orario', hourText: 'Ora', - minuteText: 'Minuto', - secondText: 'Secondo', - millisecText: 'Millisecondo', - microsecText: 'Microsecondo', + minuteText: 'Minuti', + secondText: 'Secondi', + millisecText: 'Millisecondi', + microsecText: 'Microsecondi', timezoneText: 'Fuso orario', currentText: 'Adesso', closeText: 'Chiudi', diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index 56ad172..425f3ec 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -229,7 +229,7 @@ // controlType is string - key to our this._controls if(typeof(tp_inst._defaults.controlType) === 'string'){ - if($.fn[tp_inst._defaults.controlType] === undefined){ + if(tp_inst._defaults.controlType == 'slider' && typeof(jQuery.ui.slider) === 'undefined'){ tp_inst._defaults.controlType = 'select'; } tp_inst.control = tp_inst._controls[tp_inst._defaults.controlType]; |