Skip to content

Commit

Permalink
removed (buggy) ISO8601 parsing, this is taken care of by date.js
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Reinsch committed Jun 21, 2010
1 parent 58c99eb commit 222dc1c
Show file tree
Hide file tree
Showing 3 changed files with 147 additions and 43 deletions.
44 changes: 1 addition & 43 deletions jquery.weekcalendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -1888,7 +1888,7 @@
*/
_cleanDate : function(d) {
if (typeof d == 'string') {
return $.weekCalendar.parseISO8601(d, true) || Date.parse(d) || new Date(parseInt(d));
return Date.parse(d) || new Date(parseInt(d));
}
if (typeof d == 'number') {
return new Date(d);
Expand Down Expand Up @@ -2418,48 +2418,6 @@
var MILLIS_IN_DAY = 86400000;
var MILLIS_IN_WEEK = MILLIS_IN_DAY * 7;

$.weekCalendar = function() {
return {
parseISO8601 : function(s, ignoreTimezone) {

// derived from http://delete.me.uk/2005/03/iso8601.html
var regexp = "([0-9]{4})(-([0-9]{2})(-([0-9]{2})" +
"(T([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?" +
"(Z|(([-+])([0-9]{2}):([0-9]{2})))?)?)?)?";
var d = s.match(new RegExp(regexp));
if (!d) return null;
var offset = 0;
var date = new Date(d[1], 0, 1);
if (d[3]) {
date.setMonth(d[3] - 1);
}
if (d[5]) {
date.setDate(d[5]);
}
if (d[7]) {
date.setHours(d[7]);
}
if (d[8]) {
date.setMinutes(d[8]);
}
if (d[10]) {
date.setSeconds(d[10]);
}
if (d[12]) {
date.setMilliseconds(Number("0." + d[12]) * 1000);
}
if (!ignoreTimezone) {
if (d[14]) {
offset = (Number(d[16]) * 60) + Number(d[17]);
offset *= ((d[15] == '-') ? 1 : -1);
}
offset -= date.getTimezoneOffset();
}
return new Date(Number(date) + (offset * 60 * 1000));
}
};
}();

/* FREE BUSY MANAGERS */
var FreeBusyProto = {
getStart: function(){return this.getOption('start')},
Expand Down
Loading

0 comments on commit 222dc1c

Please sign in to comment.