From a01b21e9d9123736c70990d71d856c2de71b41b2 Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Sun, 8 Apr 2018 15:51:50 -0400
Subject: [PATCH] Bump version. Update changelog. Tweak strings for the new
 emote alignment setting.

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

diff --git a/changelog.html b/changelog.html
index a96ea7b3..6691d1e7 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,11 @@
+<div class="list-header">4.0.0-beta2.2<span>@201497e9898b452ba698</span> <time datetime="2018-04-08">(2018-04-08)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Added: Support for the old Featured Channels feature.</li>
+	<li>Added: Emote alignment setting.</li>
+	<li>Fixed: Some tooltips only displaying once.</li>
+	<li>Fixed: Route sorting issue causing potentially inconsistent behavior on some pages, including various directory pages.</li>
+</ul>
+
 <div class="list-header">4.0.0-beta2.1<span>@1a56c5fabae6fb37d845</span> <time datetime="2018-04-07">(2018-04-07)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Added several settings to configure the emote menu.</li>
diff --git a/src/main.js b/src/main.js
index 79349c26..6eea12b5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -95,7 +95,7 @@ class FrankerFaceZ extends Module {
 FrankerFaceZ.Logger = Logger;
 
 const VER = FrankerFaceZ.version_info = {
-	major: 4, minor: 0, revision: 0, extra: '-beta2.1',
+	major: 4, minor: 0, revision: 0, extra: '-beta2.2',
 	build: __webpack_hash__,
 	toString: () =>
 		`${VER.major}.${VER.minor}.${VER.revision}${VER.extra || ''}${DEBUG ? '-dev' : ''}`
diff --git a/src/sites/twitch-twilight/modules/chat/index.js b/src/sites/twitch-twilight/modules/chat/index.js
index bbae6a4c..5509be8f 100644
--- a/src/sites/twitch-twilight/modules/chat/index.js
+++ b/src/sites/twitch-twilight/modules/chat/index.js
@@ -238,13 +238,13 @@ export default class ChatHook extends Module {
 			default: 0,
 			ui: {
 				path: 'Chat > Appearance >> Chat Lines',
-				title: 'Emoticon Alignment',
-				description: 'Change how emotes are aligned and padded in chat, making messages taller but preventing emotes from overlapping.',
+				title: 'Emote Alignment',
+				description: 'Change how emotes are positioned in chat, potentially making messages taller in order to avoid having emotes overlap.',
 				component: 'setting-select-box',
 				data: [
 					{value: 0, title: 'Standard'},
 					{value: 1, title: 'Padded'},
-					{value: 2, title: 'Baseline (BTTV-Like'}
+					{value: 2, title: 'Baseline (BTTV-Like)'}
 				]
 			}
 		});
@@ -325,6 +325,7 @@ export default class ChatHook extends Module {
 		this.chat.context.on('changed:chat.width', this.updateChatCSS, this);
 		this.chat.context.on('changed:chat.font-size', this.updateChatCSS, this);
 		this.chat.context.on('changed:chat.font-family', this.updateChatCSS, this);
+		this.chat.context.on('changed:chat.lines.emote-alignment', this.updateChatCSS, this);
 		this.chat.context.on('changed:chat.adjustment-mode', this.updateColors, this);
 		this.chat.context.on('changed:chat.adjustment-contrast', this.updateColors, this);
 		this.chat.context.on('changed:theme.is-dark', this.updateColors, this);
@@ -333,8 +334,6 @@ export default class ChatHook extends Module {
 		this.chat.context.on('changed:chat.filtering.highlight-tokens', this.updateMentionCSS, this);
 		this.chat.context.on('changed:chat.fix-bad-emotes', this.updateChatLines, this);
 
-		this.chat.context.on('changed:chat.lines.emote-alignment', this.updateChatCSS, this);
-
 		this.chat.context.on('changed:chat.lines.alternate', val => {
 			this.css_tweaks.toggle('chat-rows', val);
 			this.updateMentionCSS();