Merge pull request trentrichardson#688 from spmorganjr/dev

Issue # 687 - Calendar remians open after date selection when showTimepicker = false

Author: trentrichardson

src/jquery-ui-timepicker-addon.js

@@ -1348,7 +1348,7 @@
 		var inst = this._getInst($(id)[0]),
 			tp_inst = this._get(inst, 'timepicker');
 
-		if (tp_inst) {
+		if (tp_inst && inst.settings.showTimepicker) {
 			tp_inst._limitMinMaxDateTime(inst, true);
 			inst.inline = inst.stay_open = true;
 			//This way the onSelect handler called from calendarpicker get the full dateTime