Skip to content

Commit e1db1b5

Browse files
trentrichardsontrentrichardson
committed
Fixes several lint errors
1 parent 77ccf39 commit e1db1b5

File tree

1 file changed

+54
-28
lines changed

1 file changed

+54
-28
lines changed

‎jquery-ui-timepicker-addon.js

Lines changed: 54 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,9 @@
339339
uitem = '',
340340
max = {},
341341
gridSize = {},
342-
size = null;
342+
size = null,
343+
i=0,
344+
l=0;
343345

344346
// Prevent displaying twice
345347
if ($dp.find("div.ui-timepicker-div").length === 0 && o.showTimepicker) {
@@ -348,7 +350,7 @@
348350
'<dd class="ui_tpicker_time"' + ((o.showTime) ? '' : noDisplay) + '></dd>';
349351

350352
// Create the markup
351-
for(var i=0,l=this.units.length; i<l; i++){
353+
for(i=0,l=this.units.length; i<l; i++){
352354
litem = this.units[i];
353355
uitem = litem.substr(0,1).toUpperCase() + litem.substr(1);
354356
// Added by Peter Medeiros:
@@ -397,7 +399,7 @@
397399
}
398400

399401
// add sliders, adjust grids, add events
400-
for(var i=0,l=tp_inst.units.length; i<l; i++){
402+
for(i=0,l=tp_inst.units.length; i<l; i++){
401403
litem = tp_inst.units[i];
402404
uitem = litem.substr(0,1).toUpperCase() + litem.substr(1);
403405

@@ -434,8 +436,7 @@
434436

435437
tp_inst._onTimeChange();
436438
tp_inst._onSelectHandler();
437-
})
438-
.css({
439+
}).css({
439440
cursor: 'pointer',
440441
width: (100 / gridSize[litem]) + '%',
441442
textAlign: 'center',
@@ -769,7 +770,7 @@
769770
var formattedDateTime = this.formattedDate;
770771

771772
// if a slider was changed but datepicker doesn't have a value yet, set it
772-
if(dp_inst.lastVal==""){
773+
if(dp_inst.lastVal===""){
773774
dp_inst.currentYear=dp_inst.selectedYear;
774775
dp_inst.currentMonth=dp_inst.selectedMonth;
775776
dp_inst.currentDay=dp_inst.selectedDay;
@@ -803,11 +804,23 @@
803804
altSeparator = this._defaults.altSeparator ? this._defaults.altSeparator : this._defaults.separator,
804805
altTimeSuffix = this._defaults.altTimeSuffix ? this._defaults.altTimeSuffix : this._defaults.timeSuffix;
805806

806-
if (this._defaults.altFormat) altFormattedDateTime = $.datepicker.formatDate(this._defaults.altFormat, (dt === null ? new Date() : dt), formatCfg);
807-
else altFormattedDateTime = this.formattedDate;
808-
if (altFormattedDateTime) altFormattedDateTime += altSeparator;
809-
if (this._defaults.altTimeFormat) altFormattedDateTime += $.datepicker.formatTime(this._defaults.altTimeFormat, this, this._defaults) + altTimeSuffix;
810-
else altFormattedDateTime += this.formattedTime + altTimeSuffix;
807+
if (this._defaults.altFormat){
808+
altFormattedDateTime = $.datepicker.formatDate(this._defaults.altFormat, (dt === null ? new Date() : dt), formatCfg);
809+
}
810+
else{
811+
altFormattedDateTime = this.formattedDate;
812+
}
813+
814+
if (altFormattedDateTime){
815+
altFormattedDateTime += altSeparator;
816+
}
817+
818+
if(this._defaults.altTimeFormat){
819+
altFormattedDateTime += $.datepicker.formatTime(this._defaults.altTimeFormat, this, this._defaults) + altTimeSuffix;
820+
}
821+
else{
822+
altFormattedDateTime += this.formattedTime + altTimeSuffix;
823+
}
811824
this.$altInput.val(altFormattedDateTime);
812825
} else {
813826
this.$input.val(formattedDateTime);
@@ -861,33 +874,39 @@
861874
if(tp_inst._defaults.isRTL){
862875
if(typeof(opts) == 'string'){
863876
if(opts == 'min' || opts == 'max'){
864-
if(val !== undefined)
877+
if(val !== undefined){
865878
return obj.slider(opts, val*-1);
879+
}
866880
return Math.abs(obj.slider(opts));
867881
}
868882
return obj.slider(opts);
869883
}
870884
var min = opts.min,
871885
max = opts.max;
872886
opts.min = opts.max = null;
873-
if(min !== undefined)
887+
if(min !== undefined){
874888
opts.max = min * -1;
875-
if(max !== undefined)
889+
}
890+
if(max !== undefined){
876891
opts.min = max * -1;
892+
}
877893
return obj.slider(opts);
878894
}
879-
if(typeof(opts) == 'string' && val !== undefined)
895+
if(typeof(opts) == 'string' && val !== undefined){
880896
return obj.slider(opts, val);
897+
}
881898
return obj.slider(opts);
882899
},
883900
value: function(tp_inst, obj, unit, val){
884901
if(tp_inst._defaults.isRTL){
885-
if(val !== undefined)
902+
if(val !== undefined){
886903
return obj.slider('value', val*-1);
904+
}
887905
return Math.abs(obj.slider('value'));
888906
}
889-
if(val !== undefined)
907+
if(val !== undefined){
890908
return obj.slider('value', val);
909+
}
891910
return obj.slider('value');
892911
}
893912
},
@@ -900,10 +919,11 @@
900919

901920
for(var i=min; i<=max; i+=step){
902921
sel += '<option value="'+ i +'"'+ (i==val? ' selected':'') +'>';
903-
if(unit == 'hour' && useAmpm(tp_inst._defaults.pickerTimeFormat || tp_inst._defaults.timeFormat))
922+
if(unit == 'hour' && useAmpm(tp_inst._defaults.pickerTimeFormat || tp_inst._defaults.timeFormat)){
904923
sel += $.datepicker.formatTime("hh TT", {hour:i}, tp_inst._defaults);
905-
else if(unit == 'millisec' || i >= 10) sel += i;
906-
else sel += '0'+ i.toString();
924+
}
925+
else if(unit == 'millisec' || i >= 10){ sel += i; }
926+
else {sel += '0'+ i.toString(); }
907927
sel += '</option>';
908928
}
909929
sel += '</select>';
@@ -921,17 +941,19 @@
921941
var o = {},
922942
$t = obj.children('select');
923943
if(typeof(opts) == 'string'){
924-
if(val === undefined)
944+
if(val === undefined){
925945
return $t.data(opts);
946+
}
926947
o[opts] = val;
927948
}
928-
else o = opts;
949+
else{ o = opts; }
929950
return tp_inst.control.create(tp_inst, obj, $t.data('unit'), $t.val(), o.min || $t.data('min'), o.max || $t.data('max'), o.step || $t.data('step'));
930951
},
931952
value: function(tp_inst, obj, unit, val){
932953
var $t = obj.children('select');
933-
if(val !== undefined)
954+
if(val !== undefined){
934955
return $t.val(val);
956+
}
935957
return $t.val();
936958
}
937959
}
@@ -1170,7 +1192,7 @@
11701192
}; // end looseParse
11711193

11721194
if(typeof o.parse === "function"){
1173-
return o.parse(timeFormat, timeString, o)
1195+
return o.parse(timeFormat, timeString, o);
11741196
}
11751197
if(o.parse === 'loose'){
11761198
return looseParse(timeFormat, timeString, o);
@@ -1348,9 +1370,12 @@
13481370

13491371
altFormattedDateTime += $.datepicker.formatTime(altTimeFormat, tp_inst, tp_inst._defaults) + altTimeSuffix;
13501372
if(!tp_inst._defaults.timeOnly && !tp_inst._defaults.altFieldTimeOnly && date !== null){
1351-
if(tp_inst._defaults.altFormat)
1373+
if(tp_inst._defaults.altFormat){
13521374
altFormattedDateTime = $.datepicker.formatDate(tp_inst._defaults.altFormat, date, formatCfg) + altSeparator + altFormattedDateTime;
1353-
else altFormattedDateTime = tp_inst.formattedDate + altSeparator + altFormattedDateTime;
1375+
}
1376+
else{
1377+
altFormattedDateTime = tp_inst.formattedDate + altSeparator + altFormattedDateTime;
1378+
}
13541379
}
13551380
$(altField).val(altFormattedDateTime);
13561381
}
@@ -1683,7 +1708,7 @@
16831708
hour = hour - 12;
16841709
}
16851710

1686-
if (hour == 0) {
1711+
if (hour === 0) {
16871712
hour = 12;
16881713
}
16891714

@@ -1907,8 +1932,9 @@
19071932
* @return void
19081933
*/
19091934
$.timepicker.log = function(err){
1910-
if(window.console)
1935+
if(window.console){
19111936
console.log(err);
1937+
}
19121938
};
19131939

19141940
/*

0 commit comments

Comments
 (0)