';
- for (var m = 0; m < minMax; m += o.minuteGrid) {
+ for (var m = o.minuteMin; m < minMax; m += o.minuteGrid) {
minuteGridSize++;
html += '| ' + ((m < 10) ? '0' : '') + m + ' | ';
}
@@ -283,7 +283,7 @@ $.extend(Timepicker.prototype, {
((o.showSecond) ? '' : noDisplay) + '>' +
'';
- for (var s = 0; s < secMax; s += o.secondGrid) {
+ for (var s = o.secondMin; s < secMax; s += o.secondGrid) {
secondGridSize++;
html += '| ' + ((s < 10) ? '0' : '') + s + ' | ';
}
From ba7074fba1fe6f37ecfe378943ffc47511c6de64 Mon Sep 17 00:00:00 2001
From: doublerebel
Date: Sat, 20 Nov 2010 17:09:37 -0800
Subject: [PATCH 2/9] Simplified keypress handling
---
jquery-ui-timepicker-addon.js | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index cf48bbc..b760340 100644
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -608,12 +608,9 @@ $.datepicker._doKeyPress = function(event) {
if (tp_inst) {
if ($.datepicker._get(inst, 'constrainInput')) {
- var dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
- chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode),
- chrl = chr.toLowerCase();
- // keyCode == 58 => ":"
- // keyCode == 32 => " "
- return event.ctrlKey || (chr < ' ' || !dateChars || dateChars.indexOf(chr) > -1 || event.keyCode == 58 || event.keyCode == 32 || chr == ':' || chr == ' ' || chrl == 'a' || chrl == 'p' || chrl == 'm');
+ var datetimeChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')) + "aAmMpP :",
+ chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
+ return event.ctrlKey || (chr < ' ' || !dateChars || dateChars.indexOf(chr) > -1);
}
} else return $.datepicker._base_doKeyPress(event);
From 95a6ef2f4451a395ef6bf1df4f90e2f16dea811f Mon Sep 17 00:00:00 2001
From: doublerebel
Date: Sat, 20 Nov 2010 17:24:03 -0800
Subject: [PATCH 3/9] Changed _doKeyPress to limit input characters correctly
based on timeFormat + a space + dateFormat (now restricts am/pm correctly
based on timeFormat)
---
jquery-ui-timepicker-addon.js | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index b760340..75f0825 100644
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -608,9 +608,14 @@ $.datepicker._doKeyPress = function(event) {
if (tp_inst) {
if ($.datepicker._get(inst, 'constrainInput')) {
- var datetimeChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')) + "aAmMpP :",
+ var datetimeChars = tp_inst._defaults.timeFormat.toString()
+ .replace(/[hms]/g, '')
+ .replace(/TT|T/g, 'APM')
+ .replace(/tt|t/g, 'apm') +
+ " " +
+ $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
- return event.ctrlKey || (chr < ' ' || !dateChars || dateChars.indexOf(chr) > -1);
+ return event.ctrlKey || (chr < ' ' || !datetimeChars || datetimeChars.indexOf(chr) > -1);
}
} else return $.datepicker._base_doKeyPress(event);
From 425b957de02772824b97572cad37cc223dff8f6a Mon Sep 17 00:00:00 2001
From: doublerebel
Date: Sat, 20 Nov 2010 17:40:24 -0800
Subject: [PATCH 4/9] Check if ampm is enabled when constraining input
---
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 75f0825..1263f0f 100644
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -610,8 +610,8 @@ $.datepicker._doKeyPress = function(event) {
if ($.datepicker._get(inst, 'constrainInput')) {
var datetimeChars = tp_inst._defaults.timeFormat.toString()
.replace(/[hms]/g, '')
- .replace(/TT|T/g, 'APM')
- .replace(/tt|t/g, 'apm') +
+ .replace(/TT|T/g, tp_inst._defaults.ampm ? 'APM' : '')
+ .replace(/tt|t/g, tp_inst._defaults.ampm ? 'apm' : '') +
" " +
$.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
From badcc050c44872d30d23a1fa5c8e3a75c0981f74 Mon Sep 17 00:00:00 2001
From: doublerebel
Date: Sat, 20 Nov 2010 18:46:20 -0800
Subject: [PATCH 5/9] Fixed ampm constraint
---
jquery-ui-timepicker-addon.js | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index 1263f0f..01413ba 100644
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -608,10 +608,13 @@ $.datepicker._doKeyPress = function(event) {
if (tp_inst) {
if ($.datepicker._get(inst, 'constrainInput')) {
- var datetimeChars = tp_inst._defaults.timeFormat.toString()
+ var ampm = tp_inst._defaults.ampm,
+ datetimeChars = tp_inst._defaults.timeFormat.toString()
.replace(/[hms]/g, '')
- .replace(/TT|T/g, tp_inst._defaults.ampm ? 'APM' : '')
- .replace(/tt|t/g, tp_inst._defaults.ampm ? 'apm' : '') +
+ .replace(/TT/g, ampm ? 'APM' : '')
+ .replace(/T/g, ampm ? 'AP' : '')
+ .replace(/tt/g, ampm ? 'apm' : '')
+ .replace(/t/g, ampm ? 'ap' : '') +
" " +
$.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
From 689ba11c35e7e4bbff4d16199a5080e45f3f858b Mon Sep 17 00:00:00 2001
From: doublerebel
Date: Sun, 21 Nov 2010 15:48:55 -0800
Subject: [PATCH 6/9] Whitespace and getDate/setDate fixes Extra tabs removed
and line endings cleaned getDate is now properly accessible from
$(target).datepicker('getDate') and correctly returns date object with time
setDate is now properly accessible from $(target).datepicker('setDate') and
can set both date and time added new method setTime, accessible from
$(target).datepicker('setTime') calling .datepicker('setDate') with no date
now sets the default date as in original datepicker code time is set to
default when calling .datepicker('setTime') with no time or calling 'setDate'
with a date and no time added new internal function _parseTime to parse
string times from any source
---
jquery-ui-timepicker-addon.js | 189 +++++++++++++++++++---------------
1 file changed, 108 insertions(+), 81 deletions(-)
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index 01413ba..0830e2c 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.8.1
-* Last Modified: 11/20/2010 by Charles Phillips
+* Last Modified: 11/21/2010 by Charles Phillips
*
* Copyright 2010 Trent Richardson
* Dual licensed under the MIT and GPL licenses.
@@ -18,7 +18,7 @@
*/
(function($) {
-
+
$.extend($.ui, { timepicker: { version: "0.8.1" } });
/* Time picker manager.
@@ -80,7 +80,7 @@ $.extend(Timepicker.prototype, {
formattedDate: '',
formattedTime: '',
formattedDateTime: '',
-
+
/* Override the default settings for all instances of the time picker.
@param settings object - the new settings to use as defaults (anonymous object)
@return the manager object */
@@ -95,7 +95,7 @@ $.extend(Timepicker.prototype, {
_newInst: function($input, o) {
var tp_inst = new Timepicker(),
inlineSettings = {};
-
+
for (var attrName in tp_inst._defaults) {
var attrValue = $input.attr('time:' + attrName);
if (attrValue) {
@@ -148,18 +148,27 @@ $.extend(Timepicker.prototype, {
var currDT = (this.$altInput) ?
this.$input.val() + ' ' + this.$altInput.val() :
this.$input.val(),
-
- regstr = this._defaults.timeFormat.toString()
+ parsedDT = this._parseTime(currDT);
+
+ this.timeDefined = (parsedDT) ? true : false;
+ this._injectTimePicker();
+ },
+
+ //########################################################################
+ // parse the time string from input value or _setTime
+ //########################################################################
+ _parseTime: function(timeString, withDate) {
+ var regstr = this._defaults.timeFormat.toString()
.replace(/h{1,2}/ig, '(\\d?\\d)')
.replace(/m{1,2}/ig, '(\\d?\\d)')
.replace(/s{1,2}/ig, '(\\d?\\d)')
.replace(/t{1,2}/ig, '(am|pm|a|p)?')
.replace(/\s/g, '\\s?') + '$',
- treg = currDT.match(new RegExp(regstr, 'i')),
+ treg = timeString.match(new RegExp(regstr, 'i')),
order = this._getFormatPositions();
- if (!this._defaults.timeOnly) {
+ if (withDate || !this._defaults.timeOnly) {
// the time should come after x number of characters and a space.
// x = at least the length of text specified by the date format
var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
@@ -183,9 +192,6 @@ $.extend(Timepicker.prototype, {
if (order.m !== -1) this.minute = treg[order.m];
if (order.s !== -1) this.second = treg[order.s];
}
-
- this.timeDefined = (treg) ? true : false;
- this._injectTimePicker();
},
//########################################################################
@@ -237,7 +243,7 @@ $.extend(Timepicker.prototype, {
html += '' +
'' +
'';
-
+
for (var h = o.hourMin; h < hourMax; h += o.hourGrid) {
hourGridSize++;
var tmph = (o.ampm && h > 12) ? h-12 : h;
@@ -249,45 +255,45 @@ $.extend(Timepicker.prototype, {
}
html += '| ' + tmph + ' | ';
}
-
+
html += '
';
-
+
for (var m = o.minuteMin; m < minMax; m += o.minuteGrid) {
minuteGridSize++;
html += '| ' + ((m < 10) ? '0' : '') + m + ' | ';
}
-
+
html += '
';
-
+
for (var s = o.secondMin; s < secMax; s += o.secondGrid) {
secondGridSize++;
html += '| ' + ((s < 10) ? '0' : '') + s + ' | ';
}
-
+
html += '