oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-07 14:50:56 +00:00
Code Wiki Activity

Update change-log. Fix a bug with cheer stacking when the standard cheers aren't available.

Browse source
This commit is contained in:
SirStendec 2018-03-25 22:16:16 -04:00
parent b44740744b
commit 8dbcf434cd
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
changelog.html
View file

@ -1,3 +1,9 @@
<div class="list-header">4.0.0-beta1.7<span>@014a758f744a54c37b26</span> <time datetime="2018-03-25">(2018-03-25)</time></div>
<ul class="chat-menu-content menu-side-padding">
<li>Added: Settings to hide the Event Bar and Rerun Bar over the player.</li>
<li>Fixed: Bug causing chat to not display properly with Cheer Stacking set to All in One in channels that don't have the standard cheers available, such as Overwatch League.</li>
</ul>
<div class="list-header">4.0.0-beta1.7<span>@177445c5a2dd0b0b9857</span> <time datetime="2018-03-24">(2018-03-24)</time></div> <div class="list-header">4.0.0-beta1.7<span>@177445c5a2dd0b0b9857</span> <time datetime="2018-03-24">(2018-03-24)</time></div>
<ul class="chat-menu-content menu-side-padding"> <ul class="chat-menu-content menu-side-padding">
<li>Changed: Reduce the size of badge previews in the badge visbility settings.</li> <li>Changed: Reduce the size of badge previews in the badge visbility settings.</li>

7
src/modules/chat/tokenizers.js
View file

@ -393,8 +393,11 @@ export const CheerEmotes = {
}); });
if ( collect ) { if ( collect ) {
const pref = collect === 2 ? 'cheer' : prefix, let pref = collect === 2 ? 'cheer' : prefix;
group = collected[pref] = collected[pref] || {total: 0, individuals: []}; if ( ! actions[pref] )
pref = prefix;
const group = collected[pref] = collected[pref] || {total: 0, individuals: []};
group.total += amount; group.total += amount;
group.individuals.push([amount, tier, prefix]); group.individuals.push([amount, tier, prefix]);