From 748c437a5780ec9e5cbdd6b7184b196c3ff03ae7 Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Sun, 23 Oct 2016 20:38:09 -0400
Subject: [PATCH] 3.5.345. Fix for browsers not supporting Object.assign (so...
 Pale Moon)

---
 changelog.html  | 5 +++++
 src/main.js     | 2 +-
 src/tokenize.js | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changelog.html b/changelog.html
index 9709143e..6c01bd63 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,8 @@
+<div class="list-header">3.5.345 <time datetime="2016-10-23">(2016-10-23)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Bug preventing FFZ emoticons from working on browsers not supporting <code>Object.assign</code>.</li>
+</ul>
+
 <div class="list-header">3.5.344 <time datetime="2016-10-22">(2016-10-22)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Added: Support for special rendering of modifier emoticons.</li>
diff --git a/src/main.js b/src/main.js
index 46c6c8cc..fb1e87e0 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: 344,
+	major: 3, minor: 5, revision: 345,
 	toString: function() {
 		return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
 	}
diff --git a/src/tokenize.js b/src/tokenize.js
index 881daa0a..c4156d80 100644
--- a/src/tokenize.js
+++ b/src/tokenize.js
@@ -1175,7 +1175,7 @@ FFZ.prototype.tokenize_emotes = function(user, room, tokens, do_report) {
 				}
 
 				// Push this emote to the tokens.
-				var token = Object.assign({}, emote.token);
+				var token = _.extend({}, emote.token);
 				token.modifiers = [];
 
 				new_tokens.push(token);