oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-25 03:58:30 +00:00
Code Wiki Activity

4.0.0-rc13.18

Browse source 
* Fixed: Hide Event Bar and Hide Rerun Bar settings for the player.
* Fixed: GiftZ event emote note working correctly.
* Fixed: Unimplemented action `Gift Subscription` appearing in the available actions in the In-Line Actions editor.
This commit is contained in:
SirStendec 2018-12-18 03:46:33 -05:00
parent e3ab5d63a3
commit 57db0387ae
4 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/chat/tokenizers.jsx
View file

@ -631,7 +631,8 @@ const render_emote = (token, createElement, wrapped) => {
'data-a-target': 'emote-name',
'data-provider': token.provider,
'data-id': token.id,
'data-set': token.set
'data-set': token.set,
'data-modifiers': ml ? mods.map(x => x.id).join(' ') : null
}
}, [emote, mods.map(x => createElement('span', {key: x.text}, render_emote(x, createElement, true)))])
}
@ -679,10 +680,11 @@ export const AddonEmotes = {
data-provider={token.provider}
data-id={token.id}
data-set={token.set}
data-modifiers={ml ? mods.map(x => x.id).join(' ') : null}
onClick={this.emotes.handleClick}
>
{emote}
{mods.map(t => <span key={t.text}>{this.tokenizers.emote.render.call(this, t, createElement)}</span>)}
{mods.map(t => <span key={t.text}>{this.tokenizers.emote.render.call(this, t, createElement, true)}</span>)}
</span>);
},
@ -701,7 +703,7 @@ export const AddonEmotes = {
emote = emote_set && emote_set.emotes[emote_id];
if ( emote )
return (<span>
return (<span class="tw-mg-05">
{this.tokenizers.emote.render.call(this, emote.token, createElement)}
{` - ${emote.hidden ? '???' : emote.name}`}
</span>);