|  | 
| 1328 | 1328 | 	$.datepicker._setTime = function(inst, date) { | 
| 1329 | 1329 | 		var tp_inst = this._get(inst, 'timepicker'); | 
| 1330 | 1330 | 		if (tp_inst) { | 
| 1331 |  | -			var defaults = tp_inst._defaults, | 
| 1332 |  | -				// calling _setTime with no date sets time to defaults | 
| 1333 |  | -				hour = date ? date.getHours() : defaults.hour, | 
| 1334 |  | -				minute = date ? date.getMinutes() : defaults.minute, | 
| 1335 |  | -				second = date ? date.getSeconds() : defaults.second, | 
| 1336 |  | -				millisec = date ? date.getMilliseconds() : defaults.millisec; | 
| 1337 |  | -			//check if within min/max times.. | 
| 1338 |  | -			// correct check if within min/max times. 	 | 
| 1339 |  | -			// Rewritten by Scott A. Woodward | 
| 1340 |  | -			var hourEq = hour === defaults.hourMin, | 
| 1341 |  | -				minuteEq = minute === defaults.minuteMin, | 
| 1342 |  | -				secondEq = second === defaults.secondMin; | 
| 1343 |  | -			var reset = false; | 
| 1344 |  | -			if (hour < defaults.hourMin || hour > defaults.hourMax) reset = true; | 
| 1345 |  | -			else if ((minute < defaults.minuteMin || minute > defaults.minuteMax) && hourEq) reset = true; | 
| 1346 |  | -			else if ((second < defaults.secondMin || second > defaults.secondMax) && hourEq && minuteEq) reset = true; | 
| 1347 |  | -			else if ((millisec < defaults.millisecMin || millisec > defaults.millisecMax) && hourEq && minuteEq && secondEq) reset = true; | 
| 1348 |  | -			if (reset) { | 
| 1349 |  | -				hour = defaults.hourMin; | 
| 1350 |  | -				minute = defaults.minuteMin; | 
| 1351 |  | -				second = defaults.secondMin; | 
| 1352 |  | -				millisec = defaults.millisecMin; | 
| 1353 |  | -			} | 
| 1354 |  | -			tp_inst.hour = hour; | 
| 1355 |  | -			tp_inst.minute = minute; | 
| 1356 |  | -			tp_inst.second = second; | 
| 1357 |  | -			tp_inst.millisec = millisec; | 
| 1358 |  | -			if (tp_inst.hour_slider) tp_inst.hour_slider.slider('value', hour); | 
| 1359 |  | -			if (tp_inst.minute_slider) tp_inst.minute_slider.slider('value', minute); | 
| 1360 |  | -			if (tp_inst.second_slider) tp_inst.second_slider.slider('value', second); | 
| 1361 |  | -			if (tp_inst.millisec_slider) tp_inst.millisec_slider.slider('value', millisec); | 
|  | 1331 | +			var defaults = tp_inst._defaults; | 
|  | 1332 | + | 
|  | 1333 | +			// calling _setTime with no date sets time to defaults | 
|  | 1334 | +			tp_inst.hour = date ? date.getHours() : defaults.hour; | 
|  | 1335 | +			tp_inst.minute = date ? date.getMinutes() : defaults.minute; | 
|  | 1336 | +			tp_inst.second = date ? date.getSeconds() : defaults.second; | 
|  | 1337 | +			tp_inst.millisec = date ? date.getMilliseconds() : defaults.millisec; | 
|  | 1338 | + | 
|  | 1339 | +			//check if within min/max times..  | 
|  | 1340 | +			tp_inst._limitMinMaxDateTime(inst, true); | 
| 1362 | 1341 | 
 | 
| 1363 | 1342 | 			tp_inst._onTimeChange(); | 
| 1364 | 1343 | 			tp_inst._updateDateTime(inst); | 
|  | 
0 commit comments