summaryrefslogtreecommitdiffstats
path: root/jquery-ui-timepicker-addon.js
diff options
context:
space:
mode:
authorTrent Richardson <trentdrichardson@gmail.com>2010-09-20 16:15:36 -0400
committerTrent Richardson <trentdrichardson@gmail.com>2010-09-20 16:15:36 -0400
commit4f75af447cfde8f4726403b35a3b3f4a4654f9fa (patch)
treeb1226886c6a5f18f4b09ab9bf669df5712786ddb /jquery-ui-timepicker-addon.js
parent984387b0dbfc304446b63763d423a2c9f8417655 (diff)
parentc4402c7f04a9d7b97cc938eddf3d03b6cc42fe43 (diff)
downloadjQuery-Timepicker-Addon-4f75af447cfde8f4726403b35a3b3f4a4654f9fa.zip
jQuery-Timepicker-Addon-4f75af447cfde8f4726403b35a3b3f4a4654f9fa.tar.gz
jQuery-Timepicker-Addon-4f75af447cfde8f4726403b35a3b3f4a4654f9fa.tar.bz2
Merge branch 'master' of github.com:trentrichardson/jQuery-Timepicker-Addon
Diffstat (limited to 'jquery-ui-timepicker-addon.js')
-rwxr-xr-xjquery-ui-timepicker-addon.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index b235931..71094b0 100755
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -88,7 +88,8 @@
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
- regstr = '.{' + this.defaults.dateFormat.length + ',}\\s+' + regstr;
+ var dp_dateFormat = $.datepicker._get(dp_inst, 'dateFormat');
+ regstr = '.{' + dp_dateFormat.length + ',}\\s+' + regstr;
}
var order = this.getFormatPositions();