oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-05 18:48:31 +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

2
src/main.js
View file

@ -149,7 +149,7 @@ ${typeof x[1] === 'string' ? x[1] : JSON.stringify(x[1], null, 4)}`
FrankerFaceZ.Logger = Logger; FrankerFaceZ.Logger = Logger;
const VER = FrankerFaceZ.version_info = { const VER = FrankerFaceZ.version_info = {
major: 4, minor: 0, revision: 0, extra: '-rc13.17', major: 4, minor: 0, revision: 0, extra: '-rc13.18',
commit: __git_commit__, commit: __git_commit__,
build: __webpack_hash__, build: __webpack_hash__,
toString: () => toString: () =>

4
src/modules/chat/actions/types.jsx
View file

@ -312,7 +312,7 @@ export const whisper = {
// ============================================================================ // ============================================================================
// Gift Subscription // Gift Subscription
// ============================================================================ // ============================================================================
/*
export const gift_sub = { export const gift_sub = {
presets: [{ presets: [{
appearance: { appearance: {
@ -334,4 +334,4 @@ export const gift_sub = {
Woop woop. Woop woop.
</div>); </div>);
} }
} }*/

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

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

6
src/sites/twitch-twilight/modules/css_tweaks/index.js
View file

@ -24,13 +24,13 @@ const CLASSES = {
'player-ext': '.player .extension-taskbar,.player .extension-container', 'player-ext': '.player .extension-taskbar,.player .extension-container',
'player-ext-hover': '.player:not([data-controls="true"]) .extension-container', 'player-ext-hover': '.player:not([data-controls="true"]) .extension-container',
'player-event-bar': '.channel-page .live-event-banner-ui__header', 'player-event-bar': '.channel-root .live-event-banner-ui__header',
'player-rerun-bar': '.channel-page div.tw-c-text-overlay:not([data-a-target="hosting-ui-header"])', 'player-rerun-bar': '.channel-root div.tw-c-text-overlay:not([data-a-target="hosting-ui-header"])',
'pinned-cheer': '.pinned-cheer,.pinned-cheer-v2', 'pinned-cheer': '.pinned-cheer,.pinned-cheer-v2',
'whispers': '.whispers', 'whispers': '.whispers',
'dir-live-ind': '.live-channel-card:not([data-a-target*="host"]) .stream-type-indicator.stream-type-indicator--live,.stream-thumbnail__card .stream-type-indicator.stream-type-indicator--live', 'dir-live-ind': '.live-channel-card:not([data-a-target*="host"]) .stream-type-indicator.stream-type-indicator--live,.stream-thumbnail__card .stream-type-indicator.stream-type-indicator--live,.preview-card .stream-type-indicator.stream-type-indicator--live',
'profile-hover': '.preview-card .tw-relative:hover .ffz-channel-avatar', 'profile-hover': '.preview-card .tw-relative:hover .ffz-channel-avatar',
}; };