summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrent Richardson <trentdrichardson@gmail.com>2010-09-20 16:17:50 -0400
committerTrent Richardson <trentdrichardson@gmail.com>2010-09-20 16:17:50 -0400
commita4f3cf111f1eecbc9c4198f240df603d6416efd6 (patch)
treea53a66802d547ec1b4e504853ab7188d13c7e6c0
parent4f75af447cfde8f4726403b35a3b3f4a4654f9fa (diff)
downloadjQuery-Timepicker-Addon-a4f3cf111f1eecbc9c4198f240df603d6416efd6.zip
jQuery-Timepicker-Addon-a4f3cf111f1eecbc9c4198f240df603d6416efd6.tar.gz
jQuery-Timepicker-Addon-a4f3cf111f1eecbc9c4198f240df603d6416efd6.tar.bz2
Changed Today button to Now (localized) and Now button includes time
-rwxr-xr-xjquery-ui-timepicker-addon.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index 71094b0..c68d33a 100755
--- 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.6
-* Last Modified: 9/15/2010
+* Version 0.6.1
+* Last Modified: 9/20/2010
*
* Copyright 2010 Trent Richardson
* Dual licensed under the MIT and GPL licenses.
@@ -88,8 +88,7 @@
if (!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(dp_inst, 'dateFormat');
- regstr = '.{' + dp_dateFormat.length + ',}\\s+' + regstr;
+ regstr = '.{' + this.defaults.dateFormat.length + ',}\\s+' + regstr;
}
var order = this.getFormatPositions();
@@ -490,3 +489,5 @@
$.timepicker = new Timepicker(true); // singleton instance
})(jQuery);
+
+