Skip to content

Commit d8cd2da

Browse files
trentrichardsontrentrichardson
committed
Cleanup long lines
1 parent b1a110f commit d8cd2da

File tree

1 file changed

+37
-9
lines changed

1 file changed

+37
-9
lines changed

‎jquery-ui-timepicker-addon.js

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery timepicker addon
33
* By: Trent Richardson [http://trentrichardson.com]
44
* Version 1.0.3-dev
5-
* Last Modified: 07/01/2012
5+
* Last Modified: 09/12/2012
66
*
77
* Copyright 2012 Trent Richardson
88
* You may use this project under MIT or GPL licenses.
@@ -203,7 +203,9 @@
203203
});
204204

205205
if (tp_inst._defaults.timezoneList === null) {
206-
var timezoneList = ['-1200', '-1100', '-1000', '-0930', '-0900', '-0800', '-0700', '-0600', '-0500', '-0430', '-0400', '-0330', '-0300', '-0200', '-0100', '+0000', '+0100', '+0200', '+0300', '+0330', '+0400', '+0430', '+0500', '+0530', '+0545', '+0600', '+0630', '+0700', '+0800', '+0845', '+0900', '+0930', '+1000', '+1030', '+1100', '+1130', '+1200', '+1245', '+1300', '+1400'];
206+
var timezoneList = ['-1200', '-1100', '-1000', '-0930', '-0900', '-0800', '-0700', '-0600', '-0500', '-0430', '-0400', '-0330', '-0300', '-0200', '-0100', '+0000',
207+
'+0100', '+0200', '+0300', '+0330', '+0400', '+0430', '+0500', '+0530', '+0545', '+0600', '+0630', '+0700', '+0800', '+0845', '+0900', '+0930',
208+
'+1000', '+1030', '+1100', '+1130', '+1200', '+1245', '+1300', '+1400'];
207209

208210
if (tp_inst._defaults.timezoneIso8601) {
209211
timezoneList = $.map(timezoneList, function(val) {
@@ -315,7 +317,8 @@
315317
// Prevent displaying twice
316318
if ($dp.find("div.ui-timepicker-div").length === 0 && o.showTimepicker) {
317319
var noDisplay = ' style="display:none;"',
318-
html = '<div class="ui-timepicker-div"><dl>' + '<dt class="ui_tpicker_time_label"' + ((o.showTime) ? '' : noDisplay) + '>' + o.timeText + '</dt>' + '<dd class="ui_tpicker_time"' + ((o.showTime) ? '' : noDisplay) + '></dd>' + '<dt class="ui_tpicker_hour_label"' + ((o.showHour) ? '' : noDisplay) + '>' + o.hourText + '</dt>',
320+
html = '<div class="ui-timepicker-div"><dl>' + '<dt class="ui_tpicker_time_label"' + ((o.showTime) ? '' : noDisplay) + '>' + o.timeText + '</dt>' +
321+
'<dd class="ui_tpicker_time"' + ((o.showTime) ? '' : noDisplay) + '></dd>' + '<dt class="ui_tpicker_hour_label"' + ((o.showHour) ? '' : noDisplay) + '>' + o.hourText + '</dt>',
319322
hourGridSize = 0,
320323
minuteGridSize = 0,
321324
secondGridSize = 0,
@@ -352,7 +355,8 @@
352355
html += '</dd>';
353356

354357
// Minutes
355-
html += '<dt class="ui_tpicker_minute_label"' + ((o.showMinute) ? '' : noDisplay) + '>' + o.minuteText + '</dt>' + '<dd class="ui_tpicker_minute"><div class="ui_tpicker_minute_slider"' + ((o.showMinute) ? '' : noDisplay) + '></div>';
358+
html += '<dt class="ui_tpicker_minute_label"' + ((o.showMinute) ? '' : noDisplay) + '>' + o.minuteText + '</dt>' +
359+
'<dd class="ui_tpicker_minute"><div class="ui_tpicker_minute_slider"' + ((o.showMinute) ? '' : noDisplay) + '></div>';
356360

357361
if (o.showMinute && o.minuteGrid > 0) {
358362
html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
@@ -367,7 +371,8 @@
367371
html += '</dd>';
368372

369373
// Seconds
370-
html += '<dt class="ui_tpicker_second_label"' + ((o.showSecond) ? '' : noDisplay) + '>' + o.secondText + '</dt>' + '<dd class="ui_tpicker_second"><div class="ui_tpicker_second_slider"' + ((o.showSecond) ? '' : noDisplay) + '></div>';
374+
html += '<dt class="ui_tpicker_second_label"' + ((o.showSecond) ? '' : noDisplay) + '>' + o.secondText + '</dt>' +
375+
'<dd class="ui_tpicker_second"><div class="ui_tpicker_second_slider"' + ((o.showSecond) ? '' : noDisplay) + '></div>';
371376

372377
if (o.showSecond && o.secondGrid > 0) {
373378
html += '<div style="padding-left: 1px"><table><tr>';
@@ -382,7 +387,8 @@
382387
html += '</dd>';
383388

384389
// Milliseconds
385-
html += '<dt class="ui_tpicker_millisec_label"' + ((o.showMillisec) ? '' : noDisplay) + '>' + o.millisecText + '</dt>' + '<dd class="ui_tpicker_millisec"><div class="ui_tpicker_millisec_slider"' + ((o.showMillisec) ? '' : noDisplay) + '></div>';
390+
html += '<dt class="ui_tpicker_millisec_label"' + ((o.showMillisec) ? '' : noDisplay) + '>' + o.millisecText + '</dt>' +
391+
'<dd class="ui_tpicker_millisec"><div class="ui_tpicker_millisec_slider"' + ((o.showMillisec) ? '' : noDisplay) + '></div>';
386392

387393
if (o.showMillisec && o.millisecGrid > 0) {
388394
html += '<div style="padding-left: 1px"><table><tr>';
@@ -813,7 +819,9 @@
813819

814820
// If the update was done in the input field, the input field should not be updated.
815821
// If the update was done using the sliders, update the input field.
816-
var hasChanged = (hour != this.hour || minute != this.minute || second != this.second || millisec != this.millisec || (this.ampm.length > 0 && (hour < 12) != ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) || ((this.timezone === null && timezone != this.defaultTimezone) || (this.timezone !== null && timezone != this.timezone)));
822+
var hasChanged = (hour != this.hour || minute != this.minute || second != this.second || millisec != this.millisec
823+
|| (this.ampm.length > 0 && (hour < 12) != ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1))
824+
|| ((this.timezone === null && timezone != this.defaultTimezone) || (this.timezone !== null && timezone != this.timezone)));
817825

818826
if (hasChanged) {
819827

@@ -1061,7 +1069,15 @@
10611069

10621070
var o = extendRemove(extendRemove({}, $.timepicker._defaults), options || {});
10631071

1064-
var regstr = '^' + timeFormat.toString().replace(/h{1,2}/ig, '(\\d?\\d)').replace(/m{1,2}/ig, '(\\d?\\d)').replace(/s{1,2}/ig, '(\\d?\\d)').replace(/l{1}/ig, '(\\d?\\d?\\d)').replace(/t{1,2}/ig, getPatternAmpm(o.amNames, o.pmNames)).replace(/z{1}/ig, '(z|[-+]\\d\\d:?\\d\\d|\\S+)?').replace(/\s/g, '\\s?') + o.timeSuffix + '$',
1072+
var regstr = '^' + timeFormat.toString()
1073+
.replace(/h{1,2}/ig, '(\\d?\\d)')
1074+
.replace(/m{1,2}/ig, '(\\d?\\d)')
1075+
.replace(/s{1,2}/ig, '(\\d?\\d)')
1076+
.replace(/l{1}/ig, '(\\d?\\d?\\d)')
1077+
.replace(/t{1,2}/ig, getPatternAmpm(o.amNames, o.pmNames))
1078+
.replace(/z{1}/ig, '(z|[-+]\\d\\d:?\\d\\d|\\S+)?')
1079+
.replace(/\s/g, '\\s?') +
1080+
o.timeSuffix + '$',
10651081
order = getFormatPositions(timeFormat),
10661082
ampm = '',
10671083
treg;
@@ -1274,7 +1290,19 @@
12741290
if ($.datepicker._get(inst, 'constrainInput')) {
12751291
var ampm = tp_inst._defaults.ampm,
12761292
dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
1277-
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' : '') + " " + tp_inst._defaults.separator + tp_inst._defaults.timeSuffix + (tp_inst._defaults.showTimezone ? tp_inst._defaults.timezoneList.join('') : '') + (tp_inst._defaults.amNames.join('')) + (tp_inst._defaults.pmNames.join('')) + dateChars,
1293+
datetimeChars = tp_inst._defaults.timeFormat.toString()
1294+
.replace(/[hms]/g, '')
1295+
.replace(/TT/g, ampm ? 'APM' : '')
1296+
.replace(/Tt/g, ampm ? 'AaPpMm' : '')
1297+
.replace(/tT/g, ampm ? 'AaPpMm' : '')
1298+
.replace(/T/g, ampm ? 'AP' : '')
1299+
.replace(/tt/g, ampm ? 'apm' : '')
1300+
.replace(/t/g, ampm ? 'ap' : '') +
1301+
" " + tp_inst._defaults.separator +
1302+
tp_inst._defaults.timeSuffix +
1303+
(tp_inst._defaults.showTimezone ? tp_inst._defaults.timezoneList.join('') : '') +
1304+
(tp_inst._defaults.amNames.join('')) + (tp_inst._defaults.pmNames.join('')) +
1305+
dateChars,
12781306
chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
12791307
return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
12801308
}

0 commit comments

Comments
 (0)