X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/c930e9176a5a85509c5b0230e2bff5c22a591432..530ef4b6c5b943cfa68b779d11cf7de29aa878bf:/docs/source/Date.html diff --git a/docs/source/Date.html b/docs/source/Date.html index cc9eaddc..fba09729 100644 --- a/docs/source/Date.html +++ b/docs/source/Date.html @@ -1,11 +1,18 @@ - - - The source code - - - - -
/** + + + + The source code + + + + +
/*!
+ * Ext JS Library 3.2.1
+ * Copyright(c) 2006-2010 Ext JS, Inc.
+ * licensing@extjs.com
+ * http://www.extjs.com/license
+ */
+
/** * @class Date * * The date parsing and formatting syntax contains a subset of @@ -153,14 +160,14 @@ Date.formatCodeToRegex = function(character, currentGroup) { Date.parseCodes[character] = p; // reassign function result to prevent repeated execution } - return p? Ext.applyIf({ - c: p.c? xf(p.c, currentGroup || "{0}") : p.c + return p ? Ext.applyIf({ + c: p.c ? xf(p.c, currentGroup || "{0}") : p.c }, p) : { g:0, c:null, s:Ext.escapeRe(character) // treat unrecognised characters as literals } -} +}; // private shorthand for Date.formatCodeToRegex since we'll be using it fairly often var $f = Date.formatCodeToRegex; @@ -208,7 +215,7 @@ Date.parseFunctions['x-date-format'] = myDateParser; * may be used as a format string to {@link #format}. Example:


 Date.formatFunctions['x-date-format'] = myDateFormatter;
 
- *

A formatting function should return a string repesentation of the passed Date object:

    + *

    A formatting function should return a string representation of the passed Date object, and is passed the following parameters:

      *
    • date : Date
      The Date to format.
    • *

    *

    To enable date strings to also be parsed according to that format, a corresponding @@ -615,15 +622,15 @@ dt = Date.parseDate("2006-02-29 03:20:01", "Y-m-d H:i:s", true); // returns null "dt = (new Date()).clearTime();", // date calculations (note: these calculations create a dependency on Ext.num()) - "y = y >= 0? y : Ext.num(def.y, dt.getFullYear());", - "m = m >= 0? m : Ext.num(def.m - 1, dt.getMonth());", - "d = d >= 0? d : Ext.num(def.d, dt.getDate());", + "y = Ext.num(y, Ext.num(def.y, dt.getFullYear()));", + "m = Ext.num(m, Ext.num(def.m - 1, dt.getMonth()));", + "d = Ext.num(d, Ext.num(def.d, dt.getDate()));", // time calculations (note: these calculations create a dependency on Ext.num()) - "h = h || Ext.num(def.h, dt.getHours());", - "i = i || Ext.num(def.i, dt.getMinutes());", - "s = s || Ext.num(def.s, dt.getSeconds());", - "ms = ms || Ext.num(def.ms, dt.getMilliseconds());", + "h = Ext.num(h, Ext.num(def.h, dt.getHours()));", + "i = Ext.num(i, Ext.num(def.i, dt.getMinutes()));", + "s = Ext.num(s, Ext.num(def.s, dt.getSeconds()));", + "ms = Ext.num(ms, Ext.num(def.ms, dt.getMilliseconds()));", "if(z >= 0 && y >= 0){", // both the year and zero-based day of year are defined and >= 0. @@ -682,7 +689,7 @@ dt = Date.parseDate("2006-02-29 03:20:01", "Y-m-d H:i:s", true); // returns null } } - Date.parseRegexes[regexNum] = new RegExp("^" + regex.join('') + "$", "i"); + Date.parseRegexes[regexNum] = new RegExp("^" + regex.join('') + "$"); Date.parseFunctions[format] = new Function("input", "strict", xf(code, regexNum, calc.join(''))); } }(), @@ -795,15 +802,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 +986,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; @@ -1315,6 +1322,7 @@ console.group('ISO-8601 Granularity Test (see http://www.w3.org/TR/NOTE-datetime console.log('Date.parseDate("1997-13-16T19:20:30.45+01:00", "c", true)= %o', Date.parseDate("1997-13-16T19:20:30.45+01:00", "c", true)); // strict date parsing with invalid month value console.groupEnd(); -//*/

- +//*/ +
+ \ No newline at end of file