summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrent Richardson <trentdrichardson@gmail.com>2013-11-21 13:25:42 -0500
committerTrent Richardson <trentdrichardson@gmail.com>2013-11-21 13:25:42 -0500
commit3be567e4d8cf718297c8f176265888b8101803c3 (patch)
tree6626800fda25aea817143b08046b16b6b47ba317
parent953cd46719d716e02dbef0a2876242daf21b0f52 (diff)
downloadjQuery-Timepicker-Addon-3be567e4d8cf718297c8f176265888b8101803c3.zip
jQuery-Timepicker-Addon-3be567e4d8cf718297c8f176265888b8101803c3.tar.gz
jQuery-Timepicker-Addon-3be567e4d8cf718297c8f176265888b8101803c3.tar.bz2
Update comments for #644 fix
-rw-r--r--dist/jquery-ui-timepicker-addon.js4
-rw-r--r--src/jquery-ui-timepicker-addon.js4
2 files changed, 4 insertions, 4 deletions
diff --git a/dist/jquery-ui-timepicker-addon.js b/dist/jquery-ui-timepicker-addon.js
index 912c53e..1cc11fd 100644
--- a/dist/jquery-ui-timepicker-addon.js
+++ b/dist/jquery-ui-timepicker-addon.js
@@ -752,13 +752,13 @@
// If the update was done in the input field, the input field should not be updated.
// If the update was done using the sliders, update the input field.
var hasChanged = (
- hour !== parseInt(this.hour,10) ||
+ hour !== parseInt(this.hour,10) || // sliders should all be numeric
minute !== parseInt(this.minute,10) ||
second !== parseInt(this.second,10) ||
millisec !== parseInt(this.millisec,10) ||
microsec !== parseInt(this.microsec,10) ||
(this.ampm.length > 0 && (hour < 12) !== ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) ||
- (this.timezone !== null && timezone !== this.timezone.toString())
+ (this.timezone !== null && timezone !== this.timezone.toString()) // could be numeric or "EST" format, so use toString()
);
if (hasChanged) {
diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js
index d1c1b25..1061296 100644
--- a/src/jquery-ui-timepicker-addon.js
+++ b/src/jquery-ui-timepicker-addon.js
@@ -758,13 +758,13 @@
// If the update was done in the input field, the input field should not be updated.
// If the update was done using the sliders, update the input field.
var hasChanged = (
- hour !== parseInt(this.hour,10) ||
+ hour !== parseInt(this.hour,10) || // sliders should all be numeric
minute !== parseInt(this.minute,10) ||
second !== parseInt(this.second,10) ||
millisec !== parseInt(this.millisec,10) ||
microsec !== parseInt(this.microsec,10) ||
(this.ampm.length > 0 && (hour < 12) !== ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) ||
- (this.timezone !== null && timezone !== this.timezone.toString())
+ (this.timezone !== null && timezone !== this.timezone.toString()) // could be numeric or "EST" format, so use toString()
);
if (hasChanged) {