|  | 
| 717 | 717 | 				this.ampm = ampm; | 
| 718 | 718 | 			} | 
| 719 | 719 | 
 | 
| 720 |  | -			//this._formatTime(); | 
| 721 | 720 | 			this.formattedTime = $.datepicker.formatTime(this._defaults.timeFormat, this, this._defaults); | 
| 722 | 721 | 			if (this.$timeObj) { | 
| 723 | 722 | 				this.$timeObj.text(this.formattedTime + o.timeSuffix); | 
|  | 
| 740 | 739 | 			} | 
| 741 | 740 | 		}, | 
| 742 | 741 | 
 | 
| 743 |  | -		/* | 
| 744 |  | -		* left for any backwards compatibility | 
| 745 |  | -		*/ | 
| 746 |  | -		_formatTime: function(time, format) { | 
| 747 |  | -			time = time || { | 
| 748 |  | -				hour: this.hour, | 
| 749 |  | -				minute: this.minute, | 
| 750 |  | -				second: this.second, | 
| 751 |  | -				millisec: this.millisec, | 
| 752 |  | -				ampm: this.ampm, | 
| 753 |  | -				timezone: this.timezone | 
| 754 |  | -			}; | 
| 755 |  | -			var tmptime = (format || this._defaults.timeFormat).toString(); | 
| 756 |  | - | 
| 757 |  | -			tmptime = $.datepicker.formatTime(tmptime, time, this._defaults); | 
| 758 |  | - | 
| 759 |  | -			if (arguments.length) { | 
| 760 |  | -				return tmptime; | 
| 761 |  | -			} else { | 
| 762 |  | -				this.formattedTime = tmptime; | 
| 763 |  | -			} | 
| 764 |  | -		}, | 
| 765 |  | - | 
| 766 | 742 | 		/* | 
| 767 | 743 | 		* update our input with the new date time.. | 
| 768 | 744 | 		*/ | 
|  | 
| 881 | 857 | 							sel += ' '+ ((i<12)? tp_inst._defaults.amNames[0] : tp_inst._defaults.pmNames[0])[ul](); | 
| 882 | 858 | 						} | 
| 883 | 859 | 						else if(unit == 'millisec') sel += i; | 
| 884 |  | -						else sel += ('0'+ i.toString()).substr(-2) | 
|  | 860 | +						else sel += ('0'+ i.toString()).substr(-2); | 
| 885 | 861 | 						sel += '</option>'; | 
| 886 | 862 | 					} | 
| 887 | 863 | 					sel += '</select>'; | 
|  | 
| 899 | 875 | 					var o = {}, | 
| 900 | 876 | 						$t = obj.children('select'); | 
| 901 | 877 | 					if(typeof(opts) == 'string'){ | 
| 902 |  | -						if(val == undefined) | 
|  | 878 | +						if(val === undefined) | 
| 903 | 879 | 							return $t.data(opts); | 
| 904 | 880 | 						o[opts] = val;	 | 
| 905 | 881 | 					} | 
|  | 
| 1265 | 1241 | 	$.datepicker._base_updateAlternate = $.datepicker._updateAlternate; | 
| 1266 | 1242 | 	/* Update any alternate field to synchronise with the main field. */ | 
| 1267 | 1243 | 	$.datepicker._updateAlternate = function(inst) { | 
| 1268 |  | -		tp_inst = this._get(inst, 'timepicker'); | 
|  | 1244 | +		var tp_inst = this._get(inst, 'timepicker'); | 
| 1269 | 1245 | 		if(tp_inst){ | 
| 1270 | 1246 | 			var altField = tp_inst._defaults.altField; | 
| 1271 | 1247 | 			if (altField) { // update alternate field too | 
|  | 
0 commit comments