Handling timezones regardless of server TZ setting.

.gitignore

@@ -1 +1,19 @@
 node_modules
+
+.idea/workspace.xml
+
+.idea/vcs.xml
+
+.idea/scopes/scope_settings.xml
+
+.idea/modules.xml
+
+.idea/misc.xml
+
+.idea/jsLibraryMappings.xml
+
+.idea/ical.js.iml
+
+.idea/encodings.xml
+
+.idea/.name

ical.js

@@ -4,7 +4,7 @@
  *
  *  <[email protected]>
  * **************/
-
+var moment = require('moment-timezone');
 
 // Unescape Text re RFC 4.3.11
 var text = function(t){
@@ -42,66 +42,23 @@ var storeParam = function(name){
   }
 }
 
-var addTZ = function(dt, name, params){
-  var p = parseParams(params);
-
-  if (params && p){
-    dt[name].tz = p.TZID
-  }
-
-  return dt
-}
-
 
 var dateParam = function(name){
-  return function(val, params, curr){
-
-    // Store as string - worst case scenario
-    storeParam(name)(val, undefined, curr)
-
-    if (params && params[0] === "VALUE=DATE") {
-      // Just Date
+  return function(val, params, curr) {
+      // Store as string - worst case scenario
+      storeParam(name)(val, undefined, curr)
 
       var comps = /^(\d{4})(\d{2})(\d{2})$/.exec(val);
-      if (comps !== null) {
-        // No TZ info - assume same timezone as this computer
-        curr[name] = new Date(
-          comps[1],
-          parseInt(comps[2], 10)-1,
-          comps[3]
-        );
-
-        return addTZ(curr, name, params);
-      }
-    }
-
-
-    //typical RFC date-time format
-    var comps = /^(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})(Z)?$/.exec(val);
-    if (comps !== null) {
-      if (comps[7] == 'Z'){ // GMT
-        curr[name] = new Date(Date.UTC(
-          parseInt(comps[1], 10),
-          parseInt(comps[2], 10)-1,
-          parseInt(comps[3], 10),
-          parseInt(comps[4], 10),
-          parseInt(comps[5], 10),
-          parseInt(comps[6], 10 )
-        ));
-        // TODO add tz
-      } else {
-        curr[name] = new Date(
-          parseInt(comps[1], 10),
-          parseInt(comps[2], 10)-1,
-          parseInt(comps[3], 10),
-          parseInt(comps[4], 10),
-          parseInt(comps[5], 10),
-          parseInt(comps[6], 10)
-        );
+      if (comps) {
+        curr[name] = moment(val,'YYYYMMDD');
+        curr[name].bAllDay = true;
+      } else if (val) {
+        curr[name] = moment(val,'YYYYMMDDTHHmmss');
       }
-    }
+      if (curr[name])
+          curr[name] = curr[name].toDate();
 
-    return addTZ(curr, name, params)
+      return curr[name];
   }
 }
 
@@ -115,8 +72,6 @@ var geoParam = function(name){
   }
 }
 
-
-
 exports.objectHandlers = {
   'BEGIN' : function(component, params, curr){
       if (component === 'VCALENDAR')

node-ical.js

@@ -18,9 +18,19 @@ exports.parseFile = function(filename){
 }
 
 
-var rrule = require('rrule').RRule
+var RRule = require('rrule').RRule;
+var hInstances = {};
 
 ical.objectHandlers['RRULE'] = function(val, params, curr, par, line){
-  curr['rrule'] = rrule.fromString(line.replace("RRULE:", ""));
+  if (par) {
+      var id;
+      for (var sID in par) {
+          id = sID;
+      }
+      if (id) {
+          hInstances[id] = new RRule(RRule.parseString(line.replace("RRULE:", "")));
+          curr['rrule'] = hInstances[id].all();
+      }
+  }
   return curr
 }

package.json

@@ -15,7 +15,8 @@
     "url": "git://github.com/peterbraden/ical.js.git"
   },
   "dependencies": {
-    "request": "",
+    "request": "*",
+    "moment-timezone":"*",
     "rrule": "2.0.0"
   },
   "devDependencies": {