Fix ampm bug in formatTime

Author: trentrichardson

index.html

@@ -365,8 +365,10 @@ <h2>Formatting Your Time</h2>
 					<p>The default format is "hh:mm tt", however ampm is turned off by default, so you will see "hh:mm"</p>
 
 					<dl class="defs">
-						<dt>h</dt><dd>Hour with no leading 0</dd>
-						<dt>hh</dt><dd>Hour with leading 0</dd>
+						<dt>H</dt><dd>Hour with no leading 0 (24 hour)</dd>
+						<dt>HH</dt><dd>Hour with leading 0 (24 hour)</dd>
+						<dt>h</dt><dd>Hour with no leading 0 (12 hour)</dd>
+						<dt>hh</dt><dd>Hour with leading 0 (12 hour)</dd>
 						<dt>m</dt><dd>Minute with no leading 0</dd>
 						<dt>mm</dt><dd>Minute with leading 0</dd>
 						<dt>s</dt><dd>Second with no leading 0</dd>
@@ -507,8 +509,8 @@ <h3 id="basic_examples">Basic Initializations</h3>
 <pre>
 $('#basic_example_3').datetimepicker({
 	timeFormat: "h:m t",
-	pickerTimeFormat: "HH:mm",
-	ampm: true
+	pickerTimeFormat: "HH:mm"//,
+	//ampm: true
 });
 </pre>
 					</div>

jquery-ui-timepicker-addon.js

@@ -1150,15 +1150,11 @@
 			hour = 12;
 		}
 
-		var result;
 		if (hour < 10) {
-			result = "0" + hour;
-		}
-		else {
-			result = String(hour);
+			hour = "0" + hour;
 		}
 
-		return result;
+		return String(hour);
 	};
 
 	/*
@@ -1181,11 +1177,11 @@
 		var tmptime = format,
 			ampmName = options.amNames[0],
 			hour = parseInt(time.hour, 10);
-		if (options.ampm) {
-			if (hour > 11) {
-				ampmName = options.pmNames[0];
-			}
+			
+		if (hour > 11) {
+			ampmName = options.pmNames[0];
 		}
+
 		tmptime = tmptime.replace(/(?:HH?|hh?|mm?|ss?|[tT]{1,2}|[lz]|('.*?'|".*?"))/g, function(match) {
 		switch (match) {
 			case 'HH':