oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-02 17:18:31 +00:00
Code Wiki Activity

3.5.345. Fix for browsers not supporting Object.assign (so... Pale Moon)

Browse source
This commit is contained in:
SirStendec 2016-10-23 20:38:09 -04:00
parent cb7c4441eb
commit 748c437a57
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
changelog.html
View file

@ -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> <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"> <ul class="chat-menu-content menu-side-padding">
<li>Added: Support for special rendering of modifier emoticons.</li> <li>Added: Support for special rendering of modifier emoticons.</li>

2
src/main.js
View file

@ -61,7 +61,7 @@ FFZ.channel_metadata = {};
// Version // Version
var VER = FFZ.version_info = { var VER = FFZ.version_info = {
major: 3, minor: 5, revision: 344, major: 3, minor: 5, revision: 345,
toString: function() { toString: function() {
return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || ""); return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
} }

2
src/tokenize.js
View file

@ -1175,7 +1175,7 @@ FFZ.prototype.tokenize_emotes = function(user, room, tokens, do_report) {
} }
// Push this emote to the tokens. // Push this emote to the tokens.
var token = Object.assign({}, emote.token); var token = _.extend({}, emote.token);
token.modifiers = []; token.modifiers = [];
new_tokens.push(token); new_tokens.push(token);