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

Emote Menu? Emote Menu.

Browse source 
* Add the emote menu.
* Add an option to replace the emote menu icon with the FFZ icon.
* Add icons to the icon font.
* Add a basic human duration formatting method to i18n.
* Add methods to the emotes module to get sets including the providers.
* Add a method to the emotes module to load an arbitrary set.
* Add a map to the emotes module for identifying providers.
* Add new events for when emote sets change.
* Add support for loading featured channel emotes.
* Add an option to suppress source sets in emote tooltips.
* Add an option to display a sellout line in emote tooltips.
* Remove emote menu from the WIP section of the home page of the menu.
* Fix a typo in rich content.
* Remove a bit of logging from fine.
* Add helper methods for set comparison and basic debouncing to utilities/object.
* Add constants for the emote menu.
* Add methods to show/hide a tooltip to the tooltip data object.
This commit is contained in:
SirStendec 2018-04-06 21:12:12 -04:00
parent 92130ebac4
commit e6e11fe562
23 changed files with 1423 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -477,8 +477,9 @@ export const AddonEmotes = {
},
tooltip(target, tip) {
const provider = target.dataset.provider,
modifiers = target.dataset.modifierInfo;
const ds = target.dataset,
provider = ds.provider,
modifiers = ds.modifierInfo;
let preview, source, owner, mods;
@ -496,7 +497,7 @@ export const AddonEmotes = {
}
if ( provider === 'twitch' ) {
const emote_id = parseInt(target.dataset.id, 10),
const emote_id = parseInt(ds.id, 10),
set_id = this.emotes.getTwitchEmoteSet(emote_id, tip.rerender),
emote_set = set_id != null && this.emotes.getTwitchSetChannel(set_id, tip.rerender);
@ -519,8 +520,8 @@ export const AddonEmotes = {
}
} else if ( provider === 'ffz' ) {
const emote_set = this.emotes.emote_sets[target.dataset.set],
emote = emote_set && emote_set.emotes[target.dataset.id];
const emote_set = this.emotes.emote_sets[ds.set],
emote = emote_set && emote_set.emotes[ds.id];
if ( emote_set )
source = emote_set.source_line || (`${emote_set.source || 'FFZ'} ${emote_set.title || 'Global'}`);
@ -538,6 +539,9 @@ export const AddonEmotes = {
}
}
const name = ds.name || target.alt,
hide_source = ds.noSource === 'true';
return [
preview && this.context.get('tooltip.emote-images') && (<img
class="preview-image"
@ -545,9 +549,9 @@ export const AddonEmotes = {
onLoad={tip.update}
/>),
this.i18n.t('tooltip.emote', 'Emote: %{code}', {code: target.alt}),
(hide_source && ! owner) ? name : this.i18n.t('tooltip.emote', 'Emote: %{code}', {code: ds.name || target.alt}),
source && this.context.get('tooltip.emote-sources') && (<div class="tw-pd-t-05">
! hide_source && source && this.context.get('tooltip.emote-sources') && (<div class="tw-pd-t-05">
{source}
</div>),
@ -555,6 +559,8 @@ export const AddonEmotes = {
{owner}
</div>),
ds.sellout && (<div class="tw-mg-t-05 tw-border-t tw-pd-t-05">{ds.sellout}</div>),
mods && (<div class="tw-pd-t-1">{mods}</div>)
];
},