Merge pull request trentrichardson#801 from RizziCR/dev

trentrichardson · trentrichardson · commit 7f5ff9126ff7 · 2015-04-14T08:31:32.000-04:00
- Fixed parseTime for altFieldTimeOnly use
diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js
@@ -1717,7 +1717,8 @@
 			}
 
 			var date = this._getDate(inst);
-			if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) {
+            var currDT = $.trim((tp_inst.$altInput && tp_inst._defaults.altFieldTimeOnly) ? tp_inst.$input.val() + ' ' + tp_inst.$altInput.val() : tp_inst.$input.val());
+            if (date && tp_inst._parseTime(currDT, !inst.settings.timeOnly)) {
 				date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
 				date.setMicroseconds(tp_inst.microsec);
 

Original file line number	Diff line number	Diff line change
`@@ -1717,7 +1717,8 @@`
`1717`	`1717`	`}`
`1718`	`1718`
`1719`	`1719`	`var date = this._getDate(inst);`
`1720`		`- if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) {`
	`1720`	`+ var currDT = $.trim((tp_inst.$altInput && tp_inst._defaults.altFieldTimeOnly) ? tp_inst.$input.val() + ' ' + tp_inst.$altInput.val() : tp_inst.$input.val());`
	`1721`	`+ if (date && tp_inst._parseTime(currDT, !inst.settings.timeOnly)) {`
`1721`	`1722`	`date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);`
`1722`	`1723`	`date.setMicroseconds(tp_inst.microsec);`
`1723`	`1724`