Skip to content

Commit 97930a1

Browse files
Merges changes by Moreno - fixes Italian i18n and slider detection
1 parent 7c60b28 commit 97930a1

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

i18n/jquery-ui-timepicker-it.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
timeOnlyTitle: 'Scegli orario',
66
timeText: 'Orario',
77
hourText: 'Ora',
8-
minuteText: 'Minuto',
9-
secondText: 'Secondo',
10-
millisecText: 'Millisecondo',
11-
microsecText: 'Microsecondo',
8+
minuteText: 'Minuti',
9+
secondText: 'Secondi',
10+
millisecText: 'Millisecondi',
11+
microsecText: 'Microsecondi',
1212
timezoneText: 'Fuso orario',
1313
currentText: 'Adesso',
1414
closeText: 'Chiudi',

jquery-ui-timepicker-addon.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229

230230
// controlType is string - key to our this._controls
231231
if(typeof(tp_inst._defaults.controlType) === 'string'){
232-
if($.fn[tp_inst._defaults.controlType] === undefined){
232+
if(tp_inst._defaults.controlType == 'slider' && typeof(jQuery.ui.slider) === 'undefined'){
233233
tp_inst._defaults.controlType = 'select';
234234
}
235235
tp_inst.control = tp_inst._controls[tp_inst._defaults.controlType];

0 commit comments

Comments
 (0)