projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Roo/htmleditor/TidySerializer.js
[roojs1]
/
Date.js
diff --git
a/Date.js
b/Date.js
index
9fa121c
..
fffb3b7
100644
(file)
--- a/
Date.js
+++ b/
Date.js
@@
-261,6
+261,7
@@
Date.parseDate = function(input, format) {
/**
* @private
*/
/**
* @private
*/
+
Date.createParser = function(format) {
var funcName = "parse" + Date.parseFunctions.count++;
var regexNum = Date.parseRegexes.length;
Date.createParser = function(format) {
var funcName = "parse" + Date.parseFunctions.count++;
var regexNum = Date.parseRegexes.length;
@@
-269,12
+270,11
@@
Date.createParser = function(format) {
var code = "Date." + funcName + " = function(input){\n"
+ "var y = -1, m = -1, d = -1, h = -1, i = -1, s = -1, o, z, v;\n"
var code = "Date." + funcName + " = function(input){\n"
+ "var y = -1, m = -1, d = -1, h = -1, i = -1, s = -1, o, z, v;\n"
- + "Roo.log(input);\n"
- + "Roo.log(regexNum);\n"
+ "var d = new Date();\n"
+ "y = d.getFullYear();\n"
+ "m = d.getMonth();\n"
+ "d = d.getDate();\n"
+ "var d = new Date();\n"
+ "y = d.getFullYear();\n"
+ "m = d.getMonth();\n"
+ "d = d.getDate();\n"
+ + "if (typeof(input) !== 'string') { input = input.toString(); }\n"
+ "var results = input.match(Date.parseRegexes[" + regexNum + "]);\n"
+ "if (results && results.length > 0) {";
var regex = "";
+ "var results = input.match(Date.parseRegexes[" + regexNum + "]);\n"
+ "if (results && results.length > 0) {";
var regex = "";
@@
-301,17
+301,17
@@
Date.createParser = function(format) {
}
code += "if (y >= 0 && m >= 0 && d > 0 && h >= 0 && i >= 0 && s >= 0)\n"
}
code += "if (y >= 0 && m >= 0 && d > 0 && h >= 0 && i >= 0 && s >= 0)\n"
- + "{v = new Date(y, m, d, h, i, s);}\n"
+ + "{v = new Date(y, m, d, h, i, s);
v.setFullYear(y);
}\n"
+ "else if (y >= 0 && m >= 0 && d > 0 && h >= 0 && i >= 0)\n"
+ "else if (y >= 0 && m >= 0 && d > 0 && h >= 0 && i >= 0)\n"
- + "{v = new Date(y, m, d, h, i);}\n"
+ + "{v = new Date(y, m, d, h, i);
v.setFullYear(y);
}\n"
+ "else if (y >= 0 && m >= 0 && d > 0 && h >= 0)\n"
+ "else if (y >= 0 && m >= 0 && d > 0 && h >= 0)\n"
- + "{v = new Date(y, m, d, h);}\n"
+ + "{v = new Date(y, m, d, h);
v.setFullYear(y);
}\n"
+ "else if (y >= 0 && m >= 0 && d > 0)\n"
+ "else if (y >= 0 && m >= 0 && d > 0)\n"
- + "{v = new Date(y, m, d);}\n"
+ + "{v = new Date(y, m, d);
v.setFullYear(y);
}\n"
+ "else if (y >= 0 && m >= 0)\n"
+ "else if (y >= 0 && m >= 0)\n"
- + "{v = new Date(y, m);}\n"
+ + "{v = new Date(y, m);
v.setFullYear(y);
}\n"
+ "else if (y >= 0)\n"
+ "else if (y >= 0)\n"
- + "{v = new Date(y);}\n"
+ + "{v = new Date(y);
v.setFullYear(y);
}\n"
+ "}return (v && (z || o))?\n" // favour UTC offset over GMT offset
+ " ((z)? v.add(Date.SECOND, (v.getTimezoneOffset() * 60) + (z*1)) :\n" // reset to UTC, then add offset
+ " v.add(Date.HOUR, (v.getGMTOffset() / 100) + (o / -100))) : v\n" // reset to GMT, then add offset
+ "}return (v && (z || o))?\n" // favour UTC offset over GMT offset
+ " ((z)? v.add(Date.SECOND, (v.getTimezoneOffset() * 60) + (z*1)) :\n" // reset to UTC, then add offset
+ " v.add(Date.HOUR, (v.getGMTOffset() / 100) + (o / -100))) : v\n" // reset to GMT, then add offset
@@
-371,7
+371,7
@@
Date.formatCodeToRegex = function(character, currentGroup) {
s:"(\\d{1,2})"}; // Numeric representation of a month, without leading zeros
case "m":
return {g:1,
s:"(\\d{1,2})"}; // Numeric representation of a month, without leading zeros
case "m":
return {g:1,
- c:"m =
parseInt(results[" + currentGroup + "], 10) - 1
;\n",
+ c:"m =
Math.max(0,parseInt(results[" + currentGroup + "], 10) - 1)
;\n",
s:"(\\d{2})"}; // Numeric representation of a month, with leading zeros
case "t":
return {g:0,
s:"(\\d{2})"}; // Numeric representation of a month, with leading zeros
case "t":
return {g:0,
@@
-704,8
+704,8
@@
Date.prototype.clearTime = function(clone){
};
// private
};
// private
-// safari setMonth is broken
-if(Roo.isSafari){
+// safari setMonth is broken
-- check that this is only donw once...
+if(Roo.isSafari
&& typeof(Date.brokenSetMonth) == 'undefined'
){
Date.brokenSetMonth = Date.prototype.setMonth;
Date.prototype.setMonth = function(num){
if(num <= -1){
Date.brokenSetMonth = Date.prototype.setMonth;
Date.prototype.setMonth = function(num){
if(num <= -1){
@@
-775,7
+775,7
@@
document.write(dt3); //returns 'Fri Oct 06 2006 07:30:00'
*/
Date.prototype.add = function(interval, value){
var d = this.clone();
*/
Date.prototype.add = function(interval, value){
var d = this.clone();
- if (!interval || value === 0)
return d;
+ if (!interval || value === 0)
{ return d; }
switch(interval.toLowerCase()){
case Date.MILLI:
d.setMilliseconds(this.getMilliseconds() + value);
switch(interval.toLowerCase()){
case Date.MILLI:
d.setMilliseconds(this.getMilliseconds() + value);