Merge branch 'master' of github.com:trentrichardson/jQuery-Timepicker-Addon

master
Trent Richardson 2010-09-20 16:15:36 -04:00
commit 4f75af447c
1 changed files with 2 additions and 1 deletions

View File

@ -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();