From 4106d5e3b6cf26945e680ab3d832927272b7492a Mon Sep 17 00:00:00 2001 From: Trent Richardson Date: Sun, 2 Oct 2011 09:51:22 -0400 Subject: [PATCH 01/16] Create new dev version --- jquery-ui-timepicker-addon.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index 28c73c8..7264cbf 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -1,8 +1,8 @@ /* * jQuery timepicker addon * By: Trent Richardson [http://trentrichardson.com] -* Version 0.9.7 -* Last Modified: 07/23/2011 +* Version 0.9.8-dev +* Last Modified: 10/02/2011 * * Copyright 2011 Trent Richardson * Dual licensed under the MIT and GPL licenses. @@ -20,7 +20,7 @@ (function($) { -$.extend($.ui, { timepicker: { version: "0.9.7" } }); +$.extend($.ui, { timepicker: { version: "0.9.8" } }); /* Time picker manager. Use the singleton instance of this class, $.timepicker, to interact with the time picker. @@ -1270,7 +1270,7 @@ function extendRemove(target, props) { } $.timepicker = new Timepicker(); // singleton instance -$.timepicker.version = "0.9.7"; +$.timepicker.version = "0.9.8"; })(jQuery); From e14e6366985becd6e9250d5357684d81bd5f525e Mon Sep 17 00:00:00 2001 From: Trent Date: Mon, 3 Oct 2011 16:48:07 -0400 Subject: [PATCH 02/16] Fix localization --- localization/jquery-ui-timepicker-pt-BR.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localization/jquery-ui-timepicker-pt-BR.js b/localization/jquery-ui-timepicker-pt-BR.js index 63143a1..b043ad8 100644 --- a/localization/jquery-ui-timepicker-pt-BR.js +++ b/localization/jquery-ui-timepicker-pt-BR.js @@ -8,7 +8,7 @@ minuteText: 'Minutos', secondText: 'Segundos', millisecText: 'Milissegundos', - timezoneText: 'Fuso horário', + timezoneText: 'Fuso horrio', currentText: 'Agora', closeText: 'Fechar', timeFormat: 'hh:mm', From 20b0c0845feb6c87d622683b580f6b32552cdba8 Mon Sep 17 00:00:00 2001 From: David Vallner Date: Thu, 13 Oct 2011 01:47:44 +0200 Subject: [PATCH 03/16] Fix Slovak localisation and add AM/PM markers --- localization/jquery-ui-timepicker-sk.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/localization/jquery-ui-timepicker-sk.js b/localization/jquery-ui-timepicker-sk.js index 28b4644..1eaacde 100644 --- a/localization/jquery-ui-timepicker-sk.js +++ b/localization/jquery-ui-timepicker-sk.js @@ -5,15 +5,15 @@ timeOnlyTitle: 'Zvoľte čas', timeText: 'Čas', hourText: 'Hodiny', - minuteText: 'Minuty', + minuteText: 'Minúty', secondText: 'Sekundy', millisecText: 'Milisekundy', timezoneText: 'Časové pásmo', currentText: 'Teraz', - closeText: 'Zavřít', + closeText: 'Zavrieť', timeFormat: 'h:m', amNames: ['dop.', 'AM', 'A'], - pmNames: ['odp.', 'PM', 'P'], + pmNames: ['pop.', 'PM', 'P'], ampm: false }; $.timepicker.setDefaults($.timepicker.regional['sk']); From 52d21bd0fdaa5671813f66f973dafbcce1bd4639 Mon Sep 17 00:00:00 2001 From: David Barral Date: Tue, 18 Oct 2011 13:38:34 +0200 Subject: [PATCH 04/16] Added Galician translation --- localization/jquery-ui-timepicker-gl.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 localization/jquery-ui-timepicker-gl.js diff --git a/localization/jquery-ui-timepicker-gl.js b/localization/jquery-ui-timepicker-gl.js new file mode 100644 index 0000000..09fea0b --- /dev/null +++ b/localization/jquery-ui-timepicker-gl.js @@ -0,0 +1,20 @@ +/* Galician translation for the jQuery Timepicker Addon */ +/* Written by David Barral */ +(function($) { + $.timepicker.regional['gl'] = { + timeOnlyTitle: 'Elixir unha hora', + timeText: 'Hora', + hourText: 'Horas', + minuteText: 'Minutos', + secondText: 'Segundos', + millisecText: 'Milisegundos', + timezoneText: 'Fuso horario', + currentText: 'Agora', + closeText: 'Pechar', + timeFormat: 'hh:mm', + amNames: ['a.m.', 'AM', 'A'], + pmNames: ['p.m.', 'PM', 'P'], + ampm: false + }; + $.timepicker.setDefaults($.timepicker.regional['gl']); +})(jQuery); From 5ee53c21b1193f612f30c0cff3e97370bd045141 Mon Sep 17 00:00:00 2001 From: Trent Date: Tue, 18 Oct 2011 08:53:32 -0400 Subject: [PATCH 05/16] Fix daylight savings by mliberato --- jquery-ui-timepicker-addon.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index 7264cbf..a253b2d 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -859,8 +859,8 @@ $.extend(Timepicker.prototype, { // update our input with the new date time.. //######################################################################## _updateDateTime: function(dp_inst) { - dp_inst = this.inst || dp_inst, - dt = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay), + dp_inst = this.inst || dp_inst; + var dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)), dateFmt = $.datepicker._get(dp_inst, 'dateFormat'), formatCfg = $.datepicker._getFormatConfig(dp_inst), timeAvailable = dt !== null && this.timeDefined; From 73adb692d0f054ef62b5adb007d167c0add56c9b Mon Sep 17 00:00:00 2001 From: Trent Date: Tue, 18 Oct 2011 09:00:10 -0400 Subject: [PATCH 06/16] Simplified Chinese by Will-Lu --- localization/jquery-ui-timepicker-zh-CN.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 localization/jquery-ui-timepicker-zh-CN.js diff --git a/localization/jquery-ui-timepicker-zh-CN.js b/localization/jquery-ui-timepicker-zh-CN.js new file mode 100644 index 0000000..ea0729d --- /dev/null +++ b/localization/jquery-ui-timepicker-zh-CN.js @@ -0,0 +1,20 @@ +/* Simplified Chinese translation for the jQuery Timepicker Addon / +/ Written by Will Lu */ +(function($) { + $.timepicker.regional['zh-CN'] = { + timeOnlyTitle: '选择时间', + timeText: '时间', + hourText: '小时', + minuteText: '分钟', + secondText: '秒钟', + millisecText: '微秒', + timezoneText: '时区', + currentText: '现在时间', + closeText: '关闭', + timeFormat: 'hh:mm', + amNames: ['AM', 'A'], + pmNames: ['PM', 'P'], + ampm: false + }; + $.timepicker.setDefaults($.timepicker.regional['zh-CN']); +})(jQuery); From c75ff1c40cfe8c82fad6d358c2e54f853cf4edf9 Mon Sep 17 00:00:00 2001 From: Trent Date: Tue, 18 Oct 2011 10:08:49 -0400 Subject: [PATCH 07/16] Fixes issue 254, 261 _updateDateTime --- jquery-ui-timepicker-addon.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index a253b2d..3f27db1 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -1204,7 +1204,7 @@ $.datepicker._formatDate = function(inst, day, month, year){ { if(day) var b = this._base_formatDate(inst, day, month, year); - tp_inst._updateDateTime(); + tp_inst._updateDateTime(inst); return tp_inst.$input.val(); } return this._base_formatDate(inst); From f1b0f2cb1fbd660e2ca45e1643996c8b60118c81 Mon Sep 17 00:00:00 2001 From: Trent Date: Fri, 21 Oct 2011 09:11:47 -0400 Subject: [PATCH 08/16] Add translation by lalaships --- localization/jquery-ui-timepicker-zh-TW.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 localization/jquery-ui-timepicker-zh-TW.js diff --git a/localization/jquery-ui-timepicker-zh-TW.js b/localization/jquery-ui-timepicker-zh-TW.js new file mode 100644 index 0000000..792aaac --- /dev/null +++ b/localization/jquery-ui-timepicker-zh-TW.js @@ -0,0 +1,20 @@ +/* Chinese translation for the jQuery Timepicker Addon */ +/* Written by Alang.lin */ +(function($) { + $.timepicker.regional['zh-TW'] = { + timeOnlyTitle: '選擇時分秒', + timeText: '時間', + hourText: '時', + minuteText: '分', + secondText: '秒', + millisecText: '毫秒', + timezoneText: '時區', + currentText: '現在時間', + closeText: '確定', + timeFormat: 'hh:mm tt', + amNames: ['上午', 'AM', 'A'], + pmNames: ['下午', 'PM', 'P'], + ampm: false + }; + $.timepicker.setDefaults($.timepicker.regional['zh-TW']); +})(jQuery); From 5b1a9af999f0edf043c36d945372d1c714235661 Mon Sep 17 00:00:00 2001 From: Trent Date: Tue, 1 Nov 2011 09:05:01 -0400 Subject: [PATCH 09/16] Added Swedish localization by Nevon --- localization/jquery-ui-timepicker-sv.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 localization/jquery-ui-timepicker-sv.js diff --git a/localization/jquery-ui-timepicker-sv.js b/localization/jquery-ui-timepicker-sv.js new file mode 100644 index 0000000..742dffa --- /dev/null +++ b/localization/jquery-ui-timepicker-sv.js @@ -0,0 +1,20 @@ +/* Swedish translation for the jQuery Timepicker Addon */ +/* Written by Nevon */ +(function($) { + $.timepicker.regional['sv'] = { + timeOnlyTitle: 'Välj en tid', + timeText: 'Timme', + hourText: 'Timmar', + minuteText: 'Minuter', + secondText: 'Sekunder', + millisecText: 'Millisekunder', + timezoneText: 'Tidszon', + currentText: 'Nu', + closeText: 'Stäng', + timeFormat: 'hh:mm', + amNames: ['AM', 'A'], + pmNames: ['PM', 'P'], + ampm: false + }; + $.timepicker.setDefaults($.timepicker.regional['sv']); +})(jQuery); From 97e6641ed84863c30a40b0434472afc00b8365f1 Mon Sep 17 00:00:00 2001 From: Trent Date: Wed, 23 Nov 2011 11:36:51 -0500 Subject: [PATCH 10/16] Update Turkish translation by Goktug Ozturk --- localization/jquery-ui-timepicker-tr.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/localization/jquery-ui-timepicker-tr.js b/localization/jquery-ui-timepicker-tr.js index bcbc1bb..aca1258 100644 --- a/localization/jquery-ui-timepicker-tr.js +++ b/localization/jquery-ui-timepicker-tr.js @@ -1,5 +1,5 @@ /* Turkish translation for the jQuery Timepicker Addon */ -/* Written by Fehmi Can Saglam */ +/* Written by Fehmi Can Saglam, Edited by Goktug Ozturk */ (function($) { $.timepicker.regional['tr'] = { timeOnlyTitle: 'Zaman Seçiniz', @@ -7,13 +7,13 @@ hourText: 'Saat', minuteText: 'Dakika', secondText: 'Saniye', - millisecText: 'Milisaniyelik', + millisecText: 'Milisaniye', timezoneText: 'Zaman Dilimi', currentText: 'Şu an', closeText: 'Tamam', timeFormat: 'hh:mm', - amNames: ['AM', 'A'], - pmNames: ['PM', 'P'], + amNames: ['ÖÖ', 'Ö'], + pmNames: ['ÖS', 'S'], ampm: false }; $.timepicker.setDefaults($.timepicker.regional['tr']); From 9a19d875eebd8af4ff7d40e1ea6dcb1110c8729b Mon Sep 17 00:00:00 2001 From: Trent Date: Thu, 1 Dec 2011 14:17:48 -0500 Subject: [PATCH 11/16] refactor markup generation; add change event --- jquery-ui-timepicker-addon.css | 4 +- jquery-ui-timepicker-addon.js | 83 +++++++++++++++++++--------------- 2 files changed, 48 insertions(+), 39 deletions(-) diff --git a/jquery-ui-timepicker-addon.css b/jquery-ui-timepicker-addon.css index 71e4c46..e0d03c2 100644 --- a/jquery-ui-timepicker-addon.css +++ b/jquery-ui-timepicker-addon.css @@ -1,6 +1,6 @@ .ui-timepicker-div .ui-widget-header { margin-bottom: 8px; } .ui-timepicker-div dl { text-align: left; } -.ui-timepicker-div dl dt { height: 25px; } -.ui-timepicker-div dl dd { margin: -25px 10px 10px 65px; } +.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; } +.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; } .ui-timepicker-div td { font-size: 90%; } .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; } diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index 3f27db1..9bdeea7 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -362,13 +362,17 @@ $.extend(Timepicker.prototype, { minuteGridSize = 0, secondGridSize = 0, millisecGridSize = 0, + sliderChange = function(event, ui) { + $(this).slider( "option", "value", ui.value); + tp_inst._onTimeChange(); + }, size; // Hours + html += '
'; if (o.showHour && o.hourGrid > 0) { - html += '
' + - '
' + - '
'; + html += '
'; for (var h = o.hourMin; h <= hourMax; h += parseInt(o.hourGrid,10)) { hourGridSize++; @@ -382,70 +386,63 @@ $.extend(Timepicker.prototype, { html += ''; } - html += '
' + tmph + '
' + - '
'; - } else html += '
'; - - html += '
' + o.minuteText + '
'; + html += ''; + } + html += ''; // Minutes + html += '
' + o.minuteText + '
'+ + '
'; + if (o.showMinute && o.minuteGrid > 0) { - html += '
' + - '
' + - '
'; + html += '
'; for (var m = o.minuteMin; m <= minMax; m += parseInt(o.minuteGrid,10)) { minuteGridSize++; html += ''; } - html += '
' + ((m < 10) ? '0' : '') + m + '
' + - '
'; - } else html += '
'; + html += ''; + } + html += ''; // Seconds html += '
' + o.secondText + '
'; + ((o.showSecond) ? '' : noDisplay) + '>' + o.secondText + ''+ + '
'; if (o.showSecond && o.secondGrid > 0) { - html += '
' + - '
' + - '
'; + html += '
'; for (var s = o.secondMin; s <= secMax; s += parseInt(o.secondGrid,10)) { secondGridSize++; html += ''; } - html += '
' + ((s < 10) ? '0' : '') + s + '
' + - '
'; - } else html += '
'; + html += ''; + } + html += ''; // Milliseconds html += '
' + o.millisecText + '
'; + ((o.showMillisec) ? '' : noDisplay) + '>' + o.millisecText + ''+ + '
'; if (o.showMillisec && o.millisecGrid > 0) { - html += '
' + - '
' + - '
'; + html += '
'; for (var l = o.millisecMin; l <= millisecMax; l += parseInt(o.millisecGrid,10)) { millisecGridSize++; html += ''; } - html += '
' + ((l < 10) ? '0' : '') + s + '
' + - '
'; - } else html += '
'; + html += ''; + } + html += ''; // Timezone html += '
Date: Fri, 2 Dec 2011 11:05:04 -0500 Subject: [PATCH 12/16] Add sliderAccess integration --- jquery-ui-timepicker-addon.js | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index 9bdeea7..857479c 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -2,7 +2,7 @@ * jQuery timepicker addon * By: Trent Richardson [http://trentrichardson.com] * Version 0.9.8-dev -* Last Modified: 10/02/2011 +* Last Modified: 12/02/2011 * * Copyright 2011 Trent Richardson * Dual licensed under the MIT and GPL licenses. @@ -12,8 +12,8 @@ * HERES THE CSS: * .ui-timepicker-div .ui-widget-header { margin-bottom: 8px; } * .ui-timepicker-div dl { text-align: left; } -* .ui-timepicker-div dl dt { height: 25px; } -* .ui-timepicker-div dl dd { margin: -25px 10px 10px 65px; } +* .ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; } +* .ui-timepicker-div dl dd { margin: 0 10px 10px 65px; } * .ui-timepicker-div td { font-size: 90%; } * .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; } */ @@ -83,7 +83,9 @@ function Timepicker() { altFieldTimeOnly: true, showTimepicker: true, timezoneIso8609: false, - timezoneList: null + timezoneList: null, + addSliderAccess: false, + sliderAccessArgs: null }; $.extend(this._defaults, this.regional['']); } @@ -362,10 +364,6 @@ $.extend(Timepicker.prototype, { minuteGridSize = 0, secondGridSize = 0, millisecGridSize = 0, - sliderChange = function(event, ui) { - $(this).slider( "option", "value", ui.value); - tp_inst._onTimeChange(); - }, size; // Hours @@ -471,9 +469,6 @@ $.extend(Timepicker.prototype, { slide: function(event, ui) { tp_inst.hour_slider.slider( "option", "value", ui.value); tp_inst._onTimeChange(); - }, - change: function(event, ui) { - tp_inst._onTimeChange(); } }); @@ -489,9 +484,6 @@ $.extend(Timepicker.prototype, { slide: function(event, ui) { tp_inst.minute_slider.slider( "option", "value", ui.value); tp_inst._onTimeChange(); - }, - change: function(event, ui) { - tp_inst._onTimeChange(); } }); @@ -504,9 +496,6 @@ $.extend(Timepicker.prototype, { slide: function(event, ui) { tp_inst.second_slider.slider( "option", "value", ui.value); tp_inst._onTimeChange(); - }, - change: function(event, ui) { - tp_inst._onTimeChange(); } }); @@ -519,9 +508,6 @@ $.extend(Timepicker.prototype, { slide: function(event, ui) { tp_inst.millisec_slider.slider( "option", "value", ui.value); tp_inst._onTimeChange(); - }, - change: function(event, ui) { - tp_inst._onTimeChange(); } }); @@ -648,6 +634,14 @@ $.extend(Timepicker.prototype, { this.minute_slider.bind('slidestop',onSelectDelegate); this.second_slider.bind('slidestop',onSelectDelegate); this.millisec_slider.bind('slidestop',onSelectDelegate); + + // slideAccess integration: http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/ + if (this._defaults.addSliderAccess){ + var sliderAccessArgs = this._defaults.sliderAccessArgs; + setTimeout(function(){ // fix for inline mode + $tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs); + },0); + } } }, From f9a9344e67777e20b4892f4ed532dff792b156be Mon Sep 17 00:00:00 2001 From: Trent Date: Fri, 2 Dec 2011 12:07:15 -0500 Subject: [PATCH 13/16] Fix grids with sliderAccess --- jquery-ui-timepicker-addon.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index 857479c..c12df50 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -435,7 +435,7 @@ $.extend(Timepicker.prototype, { for (var l = o.millisecMin; l <= millisecMax; l += parseInt(o.millisecGrid,10)) { millisecGridSize++; - html += '' + ((l < 10) ? '0' : '') + s + ''; + html += '' + ((l < 10) ? '0' : '') + l + ''; } html += ''; @@ -640,8 +640,21 @@ $.extend(Timepicker.prototype, { var sliderAccessArgs = this._defaults.sliderAccessArgs; setTimeout(function(){ // fix for inline mode $tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs); + + // fix any grids since sliders are shorter + var sliderAccessWidth = $tp.find('.ui-slider-access:eq(0)').outerWidth(true); + $tp.find('table:visible').each(function(){ + var $g = $(this), + oldWidth = $g.outerWidth(), + oldMarginLeft = $g.css('marginLeft').toString().replace('%',''), + newWidth = oldWidth - sliderAccessWidth, + newMarginLeft = ((oldMarginLeft * newWidth)/oldWidth) + '%'; + + $g.css({ width: newWidth, marginLeft: newMarginLeft }); + }); },0); } + // end slideAccess integration } }, From fab4a4428a3f31e710bafc05acb217ca5f6008fb Mon Sep 17 00:00:00 2001 From: Trent Date: Fri, 2 Dec 2011 12:19:41 -0500 Subject: [PATCH 14/16] Fix decimals results --- jquery-ui-timepicker-addon.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index c12df50..ecf9a6b 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -54,10 +54,10 @@ function Timepicker() { showMillisec: false, showTimezone: false, showTime: true, - stepHour: 0.05, - stepMinute: 0.05, - stepSecond: 0.05, - stepMillisec: 0.5, + stepHour: 1, + stepMinute: 1, + stepSecond: 1, + stepMillisec: 1, hour: 0, minute: 0, second: 0, @@ -343,10 +343,10 @@ $.extend(Timepicker.prototype, { // Added by Peter Medeiros: // - Figure out what the hour/minute/second max should be based on the step values. // - Example: if stepMinute is 15, then minMax is 45. - hourMax = (o.hourMax - ((o.hourMax - o.hourMin) % o.stepHour)).toFixed(0), - minMax = (o.minuteMax - ((o.minuteMax - o.minuteMin) % o.stepMinute)).toFixed(0), - secMax = (o.secondMax - ((o.secondMax - o.secondMin) % o.stepSecond)).toFixed(0), - millisecMax = (o.millisecMax - ((o.millisecMax - o.millisecMin) % o.stepMillisec)).toFixed(0), + hourMax = parseInt((o.hourMax - ((o.hourMax - o.hourMin) % o.stepHour)) ,10), + minMax = parseInt((o.minuteMax - ((o.minuteMax - o.minuteMin) % o.stepMinute)) ,10), + secMax = parseInt((o.secondMax - ((o.secondMax - o.secondMin) % o.stepSecond)) ,10), + millisecMax = parseInt((o.millisecMax - ((o.millisecMax - o.millisecMin) % o.stepMillisec)) ,10), dp_id = this.inst.id.toString().replace(/([^A-Za-z0-9_])/g, ''); // Prevent displaying twice @@ -748,10 +748,10 @@ $.extend(Timepicker.prototype, { } if(adjustSliders !== undefined && adjustSliders === true){ - var hourMax = (this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)).toFixed(0), - minMax = (this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)).toFixed(0), - secMax = (this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)).toFixed(0), - millisecMax = (this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)).toFixed(0); + var hourMax = parseInt((this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)) ,10), + minMax = parseInt((this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)) ,10), + secMax = parseInt((this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)) ,10), + millisecMax = parseInt((this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)) ,10); if(this.hour_slider) this.hour_slider.slider("option", { min: this._defaults.hourMin, max: hourMax }).slider('value', this.hour); From f7eafa98494a0c2642b6a44313f4975ce0407021 Mon Sep 17 00:00:00 2001 From: Trent Date: Fri, 2 Dec 2011 13:44:58 -0500 Subject: [PATCH 15/16] Adj grids only when slideAccess visible --- jquery-ui-timepicker-addon.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index ecf9a6b..d14b11b 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -643,18 +643,21 @@ $.extend(Timepicker.prototype, { // fix any grids since sliders are shorter var sliderAccessWidth = $tp.find('.ui-slider-access:eq(0)').outerWidth(true); - $tp.find('table:visible').each(function(){ - var $g = $(this), - oldWidth = $g.outerWidth(), - oldMarginLeft = $g.css('marginLeft').toString().replace('%',''), - newWidth = oldWidth - sliderAccessWidth, - newMarginLeft = ((oldMarginLeft * newWidth)/oldWidth) + '%'; + if(sliderAccessWidth){ + $tp.find('table:visible').each(function(){ + var $g = $(this), + oldWidth = $g.outerWidth(), + oldMarginLeft = $g.css('marginLeft').toString().replace('%',''), + newWidth = oldWidth - sliderAccessWidth, + newMarginLeft = ((oldMarginLeft * newWidth)/oldWidth) + '%'; - $g.css({ width: newWidth, marginLeft: newMarginLeft }); - }); + $g.css({ width: newWidth, marginLeft: newMarginLeft }); + }); + } },0); } // end slideAccess integration + } }, From 8c862700ca03b46f5b5c7b2c946722ecd9db0409 Mon Sep 17 00:00:00 2001 From: Trent Richardson Date: Sat, 3 Dec 2011 15:08:43 -0500 Subject: [PATCH 16/16] Prepare version update --- jquery-ui-timepicker-addon.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index d14b11b..1a4877f 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -1,8 +1,8 @@ /* * jQuery timepicker addon * By: Trent Richardson [http://trentrichardson.com] -* Version 0.9.8-dev -* Last Modified: 12/02/2011 +* Version 0.9.8 +* Last Modified: 12/03/2011 * * Copyright 2011 Trent Richardson * Dual licensed under the MIT and GPL licenses.