Version 3.4.5
This commit is contained in:
1 parent
fb6b5baabc
commit
e4478369d8
1360 files changed
+228921
-179445
No files matched your search
@@ -19,7 +19,7 @@ Date.parseFormattedString = function (string) {
|
||||
string = string.strip();
|
||||
var d = string.match(new RegExp(regexp, "i"));
|
||||
if (d==null) {
|
||||
return Date.parse(string); // Give javascript a chance to parse it.
|
||||
return Date.parse(string.replace(/\//, '-')); // Give javascript a chance to parse it.
|
||||
}
|
||||
|
||||
mdy = d[1].split('/');
|
||||
|
||||
@@ -14,7 +14,7 @@ Date.parseFormattedString = function(string) {
|
||||
"( ([0-9]{1,2}):([0-9]{2})(:([0-9]{2})(.([0-9]{3}))?)?" +
|
||||
")?";
|
||||
var d = string.match(new RegExp(regexp, "i"));
|
||||
if (d==null) return Date.parse(string); // at least give javascript a crack at it.
|
||||
if (d==null) return Date.parse(string.replace(/\//, '-')); // at least give javascript a crack at it.
|
||||
var offset = 0;
|
||||
var date = new Date(d[3], 0, 1);
|
||||
if (d[2]) { date.setMonth(d[2] - 1); }
|
||||
|
||||
@@ -13,7 +13,7 @@ Date.prototype.toFormattedString = function(include_time){
|
||||
Date.parseFormattedString = function (string) {
|
||||
var regexp = '([0-9]{4})-(([0-9]{1,2})-(([0-9]{1,2})( ([0-9]{1,2}):([0-9]{2})? *)?)?)?';
|
||||
var d = string.match(new RegExp(regexp, "i"));
|
||||
if (d==null) return Date.parse(string); // at least give javascript a crack at it.
|
||||
if (d==null) return Date.parse(string.replace(/\//, '-')); // at least give javascript a crack at it.
|
||||
var offset = 0;
|
||||
var date = new Date(d[1], 0, 1);
|
||||
if (d[3]) { date.setMonth(d[3] - 1); }
|
||||
|
||||
@@ -10,7 +10,7 @@ Date.prototype.toFormattedString = function(include_time){
|
||||
Date.parseFormattedString = function (string) {
|
||||
var regexp = '([0-9]{1,2})\.(([0-9]{1,2})\.(([0-9]{2,4})( ([0-9]{1,2}):([0-9]{2})? *)?)?)?';
|
||||
var d = string.match(new RegExp(regexp, "i"));
|
||||
if (d==null) return Date.parse(string); // at least give javascript a crack at it.
|
||||
if (d==null) return Date.parse(string.replace(/\//, '-')); // at least give javascript a crack at it.
|
||||
var offset = 0;
|
||||
if (d[5] && d[5].length == 2) {
|
||||
// we got only two digits for the year...
|
||||
|
||||
@@ -10,7 +10,7 @@ Date.parseFormattedString = function (string) {
|
||||
"( ([0-9]{1,2}):([0-9]{2})? *(pm|am)" +
|
||||
"?)?)?)?";
|
||||
var d = string.match(new RegExp(regexp, "i"));
|
||||
if (d==null) return Date.parse(string); // at least give javascript a crack at it.
|
||||
if (d==null) return Date.parse(string.replace(/\//, '-')); // at least give javascript a crack at it.
|
||||
var offset = 0;
|
||||
var date = new Date(d[1], 0, 1);
|
||||
if (d[3]) { date.setMonth(d[3] - 1); }
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
// Some IPB areas: MM-DD-YYYY
|
||||
Date.prototype.toFormattedString = function(include_time){
|
||||
str = Date.padded2(this.getMonth() + 1) + '-' +Date.padded2(this.getDate()) + '-' + this.getFullYear();
|
||||
|
||||
//if (include_time) { hour=this.getHours(); str += " " + this.getAMPMHour() + ":" + this.getPaddedMinutes() + " " + this.getAMPM() }
|
||||
return str;
|
||||
}
|
||||
|
||||
Date.parseFormattedString = function (string) {
|
||||
// Test these with and without the time
|
||||
// 11/11/1111 12pm
|
||||
// 11/11/1111 1pm
|
||||
// 1/11/1111 10:10pm
|
||||
// 11/1/1111 01pm
|
||||
// 1/1/1111 01:11pm
|
||||
// 1/1/1111 1:11pm
|
||||
var regexp = "(([0-1]?[0-9])\-[0-3]?[0-9]\-[0-9]{4}) *([0-9]{1,2}(:[0-9]{2})? *(am|pm))?";
|
||||
string = string.strip();
|
||||
var d = string.match(new RegExp(regexp, "i"));
|
||||
if (d==null) {
|
||||
return Date.parse(string.replace(/\//, '-')); // Give javascript a chance to parse it.
|
||||
}
|
||||
|
||||
mdy = d[1].split('/');
|
||||
hrs = 0;
|
||||
mts = 0;
|
||||
if(d[3] != null && d[3].strip() != "") {
|
||||
hrs = parseInt(d[3].split('')[0], 10);
|
||||
if(d[5].toLowerCase() == 'pm') { hrs += 12; } // Add 12 more to hrs
|
||||
mts = d[4].split(':')[1];
|
||||
}
|
||||
|
||||
return new Date(mdy[2], parseInt(mdy[0], 10)-1, mdy[1], hrs, mts, 0);
|
||||
}
|
||||
@@ -10,7 +10,7 @@ Date.prototype.toFormattedString = function(include_time){
|
||||
Date.parseFormattedString = function (string) {
|
||||
var regexp = '([0-9]{1,2})/(([0-9]{1,2})/(([0-9]{4})( ([0-9]{1,2}):([0-9]{2})? *)?)?)?';
|
||||
var d = string.match(new RegExp(regexp, "i"));
|
||||
if (d==null) return Date.parse(string); // at least give javascript a crack at it.
|
||||
if (d==null) return Date.parse(string.replace(/\//, '-')); // at least give javascript a crack at it.
|
||||
var offset = 0;
|
||||
var date = new Date(d[5], 0, 1);
|
||||
if (d[3]) { date.setMonth(d[3] - 1); }
|
||||
|
||||
Reference in new issue
Block a user