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

trentrichardson · trentrichardson · commit 4f75af447cfd · 2010-09-20T16:15:36.000-04:00
diff --git 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();

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,8 @@`
`88`	`88`
`89`	`89`	`if (!this.defaults.timeOnly) {`
`90`	`90`	`//the time should come after x number of characters and a space. x = at least the length of text specified by the date format`
`91`		`- regstr = '.{' + this.defaults.dateFormat.length + ',}\\s+' + regstr;`
	`91`	`+ var dp_dateFormat = $.datepicker._get(dp_inst, 'dateFormat');`
	`92`	`+ regstr = '.{' + dp_dateFormat.length + ',}\\s+' + regstr;`
`92`	`93`	`}`
`93`	`94`
`94`	`95`	`var order = this.getFormatPositions();`