From ab8904a6260e30f6ff3e2333d4e1d9b9dd203cad Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Fri, 17 Nov 2017 17:31:21 -0500
Subject: [PATCH] Fixed #313. Fix Volume scroll working the opposite way it
 should in Firefox. Fix typo in setting description.

---
 changelog.html                                  | 6 ++++++
 src/modules/chat/index.js                       | 2 +-
 src/sites/twitch-twilight/modules/chat/index.js | 2 +-
 src/sites/twitch-twilight/modules/player.js     | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/changelog.html b/changelog.html
index f16fcb63..acd8d304 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,9 @@
+<div class="list-header">4.0.0-beta1.3<span>@f93396a7a97f1a01b284</span> <time datetime="2017-11-17">(2017-11-17)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Chat Font Size and Family settings not being applied.</li>
+	<li>Fixed: Scroll to Change Volume being reversed on Firefox.</li>
+</ul>
+
 <div class="list-header">4.0.0-beta1.3<span>@e82e3deb4ad3e3f1b253</span> <time datetime="2017-11-17">(2017-11-17)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Added: Chat > Behavior > General > Scrollback Length</li>
diff --git a/src/modules/chat/index.js b/src/modules/chat/index.js
index baaf7789..e34e13f5 100644
--- a/src/modules/chat/index.js
+++ b/src/modules/chat/index.js
@@ -57,7 +57,7 @@ export default class Chat extends Module {
 			ui: {
 				path: 'Chat > Behavior >> General',
 				title: 'Scrollback Length',
-				description: 'Keep up to this many lines in chat. Setting this too high will create lage.',
+				description: 'Keep up to this many lines in chat. Setting this too high will create lag.',
 				component: 'setting-text-box',
 				process(val) {
 					val = parseInt(val, 10);
diff --git a/src/sites/twitch-twilight/modules/chat/index.js b/src/sites/twitch-twilight/modules/chat/index.js
index 9a6c2d62..79630030 100644
--- a/src/sites/twitch-twilight/modules/chat/index.js
+++ b/src/sites/twitch-twilight/modules/chat/index.js
@@ -250,7 +250,7 @@ export default class ChatHook extends Module {
 		this.css_tweaks.setVariable('chat-font-family', font);
 		this.css_tweaks.setVariable('chat-width', `${width}px`);
 
-		this.css_tweaks.toggle('chat-font', size === 12 && ! font);
+		this.css_tweaks.toggle('chat-font', size !== 12 || font);
 		this.css_tweaks.toggle('chat-width', width !== 340);
 	}
 
diff --git a/src/sites/twitch-twilight/modules/player.js b/src/sites/twitch-twilight/modules/player.js
index aaaf8b42..e6fed551 100644
--- a/src/sites/twitch-twilight/modules/player.js
+++ b/src/sites/twitch-twilight/modules/player.js
@@ -163,7 +163,7 @@ export default class Player extends Module {
 
 		} else if ( enabled && ! inst._ffz_scroll_handler ) {
 			inst.playerRef.addEventListener('wheel', inst._ffz_scroll_handler = e => {
-				const delta = e.wheelDelta || e.deltaY || -e.detail,
+				const delta = e.wheelDelta || -(e.deltaY || e.detail || 0),
 					player = inst.player;
 
 				if ( player ) {