X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/c930e9176a5a85509c5b0230e2bff5c22a591432..6e39d509471fe9b4e2660e0d1631b350d0c66f40:/docs/source/Date.html diff --git a/docs/source/Date.html b/docs/source/Date.html index cc9eaddc..da0a86ec 100644 --- a/docs/source/Date.html +++ b/docs/source/Date.html @@ -1,5 +1,6 @@ + The source code @@ -795,15 +796,15 @@ dt = Date.parseDate("2006-02-29 03:20:01", "Y-m-d H:i:s", true); // returns null a: { g:1, c:"if (results[{0}] == 'am') {\n" - + "if (h == 12) { h = 0; }\n" - + "} else { if (h < 12) { h += 12; }}", + + "if (!h || h == 12) { h = 0; }\n" + + "} else { if (!h || h < 12) { h = (h || 0) + 12; }}", s:"(am|pm)" }, A: { g:1, c:"if (results[{0}] == 'AM') {\n" - + "if (h == 12) { h = 0; }\n" - + "} else { if (h < 12) { h += 12; }}", + + "if (!h || h == 12) { h = 0; }\n" + + "} else { if (!h || h < 12) { h = (h || 0) + 12; }}", s:"(AM|PM)" }, g: function() { @@ -979,12 +980,12 @@ Ext.apply(Date.prototype, { * @return {Number} 0 to 364 (365 in leap years). */ getDayOfYear: function() { - var i = 0, - num = 0, + var num = 0, d = this.clone(), - m = this.getMonth(); + m = this.getMonth(), + i; - for (i = 0, d.setMonth(0); i < m; d.setMonth(++i)) { + for (i = 0, d.setDate(1), d.setMonth(0); i < m; d.setMonth(++i)) { num += d.getDaysInMonth(); } return num + this.getDate() - 1;