Merge conflict.

modules/default/calendar/calendar.js

@@ -105,7 +105,7 @@ Module.register("calendar", {
 				calendar.auth = {
 					user: calendar.user,
 					pass: calendar.pass
-				}
+				};
 			}
 
 			this.addCalendar(calendar.url, calendar.auth, calendarConfig);
@@ -191,7 +191,6 @@ Module.register("calendar", {
 				}
 			}
 
-
 			var eventWrapper = document.createElement("tr");
 
 			if (this.config.colored && !this.config.coloredSymbolOnly) {
@@ -224,7 +223,7 @@ Module.register("calendar", {
 					symbolWrapper.appendChild(symbol);
 				}
 				eventWrapper.appendChild(symbolWrapper);
-			}else if(this.config.timeFormat === "dateheaders"){
+			} else if(this.config.timeFormat === "dateheaders"){
 				var blankCell = document.createElement("td");
 				blankCell.innerHTML = "   ";
 				eventWrapper.appendChild(blankCell);
@@ -261,7 +260,7 @@ Module.register("calendar", {
 					titleWrapper.colSpan = "2";
 					titleWrapper.align = "left";
 
-				}else{
+				} else {
 
 					var timeClass = this.timeClassForUrl(event.url);
 					var timeWrapper = document.createElement("td");
@@ -274,7 +273,7 @@ Module.register("calendar", {
 				}
 
 				eventWrapper.appendChild(titleWrapper);
-			}else{
+			} else {
 				var timeWrapper = document.createElement("td");
 
 				eventWrapper.appendChild(titleWrapper);
@@ -499,7 +498,7 @@ Module.register("calendar", {
 					var midnight = moment(event.startDate, "x").clone().startOf("day").add(1, "day").format("x");
 					var count = 1;
 					while (event.endDate > midnight) {
-						var thisEvent = JSON.parse(JSON.stringify(event)) // clone object
+						var thisEvent = JSON.parse(JSON.stringify(event)); // clone object
 						thisEvent.today = thisEvent.startDate >= today && thisEvent.startDate < (today + 24 * 60 * 60 * 1000);
 						thisEvent.endDate = midnight;
 						thisEvent.title += " (" + count + "/" + maxCount + ")";
@@ -530,7 +529,6 @@ Module.register("calendar", {
 		return events.slice(0, this.config.maximumEntries);
 	},
 
-
 	listContainsEvent: function(eventList, event){
 		for(var evt of eventList){
 			if(evt.title === event.title && parseInt(evt.startDate) === parseInt(event.startDate)){
@@ -538,7 +536,6 @@ Module.register("calendar", {
 			}
 		}
 		return false;
-
 	},
 
 	/* createEventList(url)
@@ -718,7 +715,6 @@ Module.register("calendar", {
 	 * Capitalize the first letter of a string
 	 * Return capitalized string
 	 */
-
 	capFirst: function (string) {
 		return string.charAt(0).toUpperCase() + string.slice(1);
 	},

modules/default/calendar/calendarfetcher.js

@@ -37,9 +37,9 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 			if(auth.method === "bearer"){
 				opts.auth = {
 					bearer: auth.pass
-				}
+				};
 
-			}else{
+			} else {
 				opts.auth = {
 					user: auth.user,
 					pass: auth.pass
@@ -47,7 +47,7 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 
 				if(auth.method === "digest"){
 					opts.auth.sendImmediately = false;
-				}else{
+				} else {
 					opts.auth.sendImmediately = true;
 				}
 			}
@@ -107,7 +107,6 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 						}
 					}
 
-
 					// calculate the duration f the event for use with recurring events.
 					var duration = parseInt(endDate.format("x")) - parseInt(startDate.format("x"));
 
@@ -176,7 +175,7 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 					var geo = event.geo || false;
 					var description = event.description || false;
 
-					if (typeof event.rrule != "undefined" && event.rrule != null && !isFacebookBirthday) {
+					if (typeof event.rrule !== undefined && event.rrule !== null && !isFacebookBirthday) {
 						var rule = event.rrule;
 
 						// can cause problems with e.g. birthdays before 1900
@@ -341,7 +340,7 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 		} else {
 			return title.includes(filter);
 		}
-	}
+	};
 
 	/* public methods */
 
@@ -395,8 +394,6 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 	this.events = function() {
 		return events;
 	};
-
 };
 
-
 module.exports = CalendarFetcher;

modules/default/calendar/vendor/ical.js/test/test.js

@@ -214,7 +214,7 @@ vows.describe('node-ical').addBatch({
   , 'event with rrule' :{
       topic: function(events){
         return _.select(_.values(events), function(x){
-          return x.summary == "foobarTV broadcast starts"
+          return x.summary === "foobarTV broadcast starts"
         })[0];
       }
       , "Has an RRULE": function(topic){
@@ -272,7 +272,7 @@ vows.describe('node-ical').addBatch({
       },
       'grabbing custom properties': {
           topic: function(topic) {
-              
+
           }
       }
   },