From 69d98232067e51d2089f58c5e3bc0e607acbf62a Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Fri, 1 Sep 2017 16:13:02 -0400
Subject: [PATCH] 3.5.514. Fix schedule parsing. Dark CSS tweak for chat
 replay.

---
 changelog.html        | 10 ++++++++++
 dark.css              |  7 +++++++
 src/ember/vod-chat.js |  4 ++--
 src/main.js           |  2 +-
 src/ui/schedule.js    |  6 +++---
 src/utils.js          |  4 +++-
 6 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/changelog.html b/changelog.html
index 745b7370..922a85b2 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,13 @@
+<div class="list-header">3.5.514 <time datetime="2017-09-01">(2017-09-01)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Schedule parsing issue with null values.</li>
+</ul>
+
+<div class="list-header">3.5.513 <time datetime="2017-08-22">(2017-08-22)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Dark CSS tweak for Chat Replay.</li>
+</ul>
+
 <div class="list-header">3.5.512 <time datetime="2017-08-18">(2017-08-18)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Fixed: Blocked Games feature not properly hiding channels from the social bar.</li>
diff --git a/dark.css b/dark.css
index 4e0e35e8..c4fa33c0 100644
--- a/dark.css
+++ b/dark.css
@@ -1395,8 +1395,15 @@ body.ffz-dark:not([data-page="teams#show"]),
 	fill: #242424 !important;
 }
 
+.ffz-dark .app-main .chatReplay.dark,
 .ffz-dark .app-main .chatReplay .noticeWrap,
 .ffz-dark .app-main .chatReplay .notice-wrapper {
+	background-color: #19191f;
+}
+
+.ffz-dark.ffz-no-blue .app-main .chatReplay.dark,
+.ffz-dark.ffz-no-blue .app-main .chatReplay .noticeWrap,
+.ffz-dark.ffz-no-blue .app-main .chatReplay .notice-wrapper {
 	background-color: #191919;
 }
 
diff --git a/src/ember/vod-chat.js b/src/ember/vod-chat.js
index 96a2ab1c..887a02c1 100644
--- a/src/ember/vod-chat.js
+++ b/src/ember/vod-chat.js
@@ -63,12 +63,12 @@ FFZ.prototype.modify_vod_chat_display = function(component) {
 			f._vodc = this;
 
 			if ( f.settings.dark_twitch )
-				this.$().parents('.chat-container').addClass('dark');
+				this.$().parents('.chat-container').addClass('dark').addClass('theme--dark');
 
 			this.parentView.addObserver('layout.isTheatreMode', function() {
 				if ( f._vodc && f.settings.dark_twitch )
 					setTimeout(function(){
-						f._vodc.$().parents('.chat-container').addClass('dark');
+						f._vodc.$().parents('.chat-container').addClass('dark').addClass('theme--dark');
 					});
 			});
 
diff --git a/src/main.js b/src/main.js
index 5870647d..022b3f72 100644
--- a/src/main.js
+++ b/src/main.js
@@ -61,7 +61,7 @@ FFZ.channel_metadata = {};
 
 // Version
 var VER = FFZ.version_info = {
-	major: 3, minor: 5, revision: 512,
+	major: 3, minor: 5, revision: 514,
 	toString: function() {
 		return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
 	}
diff --git a/src/ui/schedule.js b/src/ui/schedule.js
index df326ecc..7d4a1e5c 100644
--- a/src/ui/schedule.js
+++ b/src/ui/schedule.js
@@ -111,7 +111,7 @@ FFZ.channel_metadata.schedule = {
 		if ( current )
 			out.push('Now: ' + format(current));
 
-		if ( next )
+		if ( next && next.starttime )
 			out.push(
 				utils.full_human_time((Date.now() - next.starttime) / 1000).capitalize() + ': ' +
 				format(next));
@@ -174,7 +174,7 @@ FFZ.channel_metadata.schedule = {
 			now = Date.now(),
 			is_current = run.starttime <= now && run.endtime >= now,
 			is_old = run.starttime < now,
-			current_date = run.starttime.toLocaleDateString();
+			current_date = run.starttime && run.starttime.toLocaleDateString();
 
 		if ( current_date !== last_date )
 			container.appendChild(utils.createElement('div', 'ffz-schedule-row ffz-schedule-date', current_date));
@@ -199,7 +199,7 @@ FFZ.channel_metadata.schedule = {
 		el.innerHTML = '<div class="heading">' +
 			'<h2>' + utils.sanitize(run.name) + ' <span>(' + utils.sanitize(run.category).replace(/ +/g, '&nbsp;') + ')</span></h2>' +
 			'</div>' +
-			'<time class="time-start html-tooltip" title="Start' + (is_old ? 'ed ' : 's ') + utils.quote_san(utils.full_human_time((now - run.starttime) / 1000)) + '." datetime="' + utils.quote_san(run.starttime) + '">' + utils.sanitize(TimeFormat.format(run.starttime)) + '</time>' +
+			(run.starttime ? '<time class="time-start html-tooltip" title="Start' + (is_old ? 'ed ' : 's ') + utils.quote_san(utils.full_human_time((now - run.starttime) / 1000)) + '." datetime="' + utils.quote_san(run.starttime) + '">' + utils.sanitize(TimeFormat.format(run.starttime)) + '</time>' : '') +
 			'<div class="meta">' + meta.join(' &mdash; ') + '</div>' +
 			'<div class="runners">Runner' + utils.pluralize(run.runners) + ': ' +
 				utils.human_join(_.map(run.runners, function(x) {
diff --git a/src/utils.js b/src/utils.js
index 601460c7..e22db5d1 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -103,7 +103,9 @@ var createElement = function(tag, className, content) {
 	date_regex = /^(\d{4}|\+\d{6})(?:-?(\d{2})(?:-?(\d{2})(?:T(\d{2})(?::?(\d{2})(?::?(\d{2})(?:(?:\.|,)(\d{1,}))?)?)?(Z|([\-+])(\d{2})(?::?(\d{2}))?)?)?)?)?$/,
 
 	parse_date = function(str) {
-		if ( typeof str === "number" )
+		if ( str === null )
+			return null;
+		else if ( typeof str === "number" )
 			return new Date(str);
 
 		var parts = str.match(date_regex);