Fixed trentrichardson#303 (by jun66j5): timeFormat: 'tt h:mm' is not parsed

clears · clears · commit 52278f8b4a3d · 2012-01-19T22:43:13.000+09:00
trentrichardson#303
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
@@ -247,7 +247,7 @@ $.extend(Timepicker.prototype, {
 			var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
 			// escape special regex characters in the seperator
 			var specials = new RegExp("[.*+?|()\\[\\]{}\\\\]", "g");
-			regstr = '.{' + dp_dateFormat.length + ',}' + this._defaults.separator.replace(specials, "\\$&") + regstr;
+			regstr = '^.{' + dp_dateFormat.length + ',}?' + this._defaults.separator.replace(specials, "\\$&") + regstr;
 		}
 		
 		treg = timeString.match(new RegExp(regstr, 'i'));

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ $.extend(Timepicker.prototype, {`
`247`	`247`	`var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');`
`248`	`248`	`// escape special regex characters in the seperator`
`249`	`249`	`var specials = new RegExp("[.*+?\|()\\[\\]{}\\\\]", "g");`
`250`		`- regstr = '.{' + dp_dateFormat.length + ',}' + this._defaults.separator.replace(specials, "\\$&") + regstr;`
	`250`	`+ regstr = '^.{' + dp_dateFormat.length + ',}?' + this._defaults.separator.replace(specials, "\\$&") + regstr;`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`treg = timeString.match(new RegExp(regstr, 'i'));`