Fixing issue #16 #16

phstc · Nov 2, 2011 · a566126 · a566126
1 parent 8c33514
commit a566126
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/README.rdoc b/README.rdoc
@@ -88,4 +88,4 @@ GPL
 
 === Contributors
 
-Thanks to albertjan, christopherstott, cipa, dahdread, docchang, eemeyer, jafin, jakemonO, jharting, kitto, larryzhao, leesolutions, nashg842
+Thanks to albertjan, christopherstott, cipa, dahdread, docchang, eemeyer, gwilson2151, jafin, jakemonO, jharting, kitto, larryzhao, leesolutions, nashg842
diff --git a/Test.html b/Test.html
@@ -173,6 +173,11 @@ <h1>JavaScript unit test file</h1>
 		assertEqual(11, $.format.date('Mon Feb 28 2011 17:45:00 GMT-0400 (Eastern Daylight Time)', 'yy'));
 		assertEqual(12, $.format.date('Mon Feb 28 20112 17:45:00 GMT-0400 (Eastern Daylight Time)', 'yy'));
 		assertEqual('13.01.10', $.format.date('Wed Jan 13 10:43:41 CET 2010', 'dd.MM.yy'));
+	}},
+	testShortHour: function() { with(this) {
+		assertEqual('5', $.format.date('Mon Feb 28 2011 17:45:00 GMT-0400 (Eastern Daylight Time)', 'h'));
+		assertEqual('5', $.format.date('Mon Feb 28 20112 17:45:00 GMT-0400 (Eastern Daylight Time)', 'h'));
+		assertEqual('13.01.10 10', $.format.date('Wed Jan 13 10:43:41 CET 2010', 'dd.MM.yy h'));
 	}}
   }); 
 // ]]>

diff --git a/jquery.dateFormat-1.0.js b/jquery.dateFormat-1.0.js
@@ -206,6 +206,14 @@
                             retValue += hour;
                             pattern = "";
                             break;
+												case "h":
+												    if (format.charAt(i + 1) == "h") {
+												        break;
+												    }
+												    var hour = (time.hour == 0 ? 12 : time.hour < 13 ? time.hour : time.hour - 12);                           
+												    retValue += hour;
+												    pattern = "";
+												    break;
                         case "mm":
                             retValue += time.minute;
                             pattern = "";