git.ithinksw.org
/
extjs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to ExtJS 4.0.1 - Released 05/18/2011
[extjs.git]
/
src
/
core
/
src
/
lang
/
Date.js
diff --git
a/src/core/src/lang/Date.js
b/src/core/src/lang/Date.js
index
b59d193
..
acabeb3
100644
(file)
--- a/
src/core/src/lang/Date.js
+++ b/
src/core/src/lang/Date.js
@@
-131,6
+131,7
@@
Ext.Date = {
/**
* Returns the current timestamp
* @return {Date} The current timestamp
/**
* Returns the current timestamp
* @return {Date} The current timestamp
+ * @method
*/
now: Date.now || function() {
return +new Date();
*/
now: Date.now || function() {
return +new Date();
@@
-459,6
+460,7
@@
Ext.Date.monthNumbers = {
* @param {String} format The format to check
* @return {Boolean} True if the format contains hour information
* @static
* @param {String} format The format to check
* @return {Boolean} True if the format contains hour information
* @static
+ * @method
*/
formatContainsHourInfo : (function(){
var stripEscapeRe = /(\\.)/g,
*/
formatContainsHourInfo : (function(){
var stripEscapeRe = /(\\.)/g,
@@
-475,6
+477,7
@@
Ext.Date.monthNumbers = {
* @return {Boolean} True if the format contains information about
* date/day information.
* @static
* @return {Boolean} True if the format contains information about
* date/day information.
* @static
+ * @method
*/
formatContainsDateInfo : (function(){
var stripEscapeRe = /(\\.)/g,
*/
formatContainsDateInfo : (function(){
var stripEscapeRe = /(\\.)/g,
@@
-865,7
+868,7
@@
dt = Ext.Date.parse("2006-02-29 03:20:01", "Y-m-d H:i:s", true); // returns null
+ "y = ty > Ext.Date.y2kYear ? 1900 + ty : 2000 + ty;\n", // 2-digit year
s:"(\\d{1,2})"
},
+ "y = ty > Ext.Date.y2kYear ? 1900 + ty : 2000 + ty;\n", // 2-digit year
s:"(\\d{1,2})"
},
- /*
*
+ /*
* In the am/pm parsing routines, we allow both upper and lower case
* even though it doesn't exactly match the spec. It gives much more flexibility
* in being able to specify case insensitive regexes.
* In the am/pm parsing routines, we allow both upper and lower case
* even though it doesn't exactly match the spec. It gives much more flexibility
* in being able to specify case insensitive regexes.
@@
-1085,6
+1088,7
@@
dt = Ext.Date.parse("2006-02-29 03:20:01", "Y-m-d H:i:s", true); // returns null
* (equivalent to the format specifier 'W', but without a leading zero).
* @param {Date} date The date
* @return {Number} 1 to 53
* (equivalent to the format specifier 'W', but without a leading zero).
* @param {Date} date The date
* @return {Number} 1 to 53
+ * @method
*/
getWeekOfYear : (function() {
// adapted from http://www.merlyn.demon.co.uk/weekcalc.htm
*/
getWeekOfYear : (function() {
// adapted from http://www.merlyn.demon.co.uk/weekcalc.htm
@@
-1168,6
+1172,7
@@
console.log(Ext.Date.dayNames[lastDay]); //output: 'Wednesday'
* Get the number of days in the current month, adjusted for leap year.
* @param {Date} date The date
* @return {Number} The number of days in the month.
* Get the number of days in the current month, adjusted for leap year.
* @param {Date} date The date
* @return {Number} The number of days in the month.
+ * @method
*/
getDaysInMonth: (function() {
var daysInMonth = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
*/
getDaysInMonth: (function() {
var daysInMonth = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];