oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-06-27 21:05:53 +00:00
Code Wiki Activity

The Report Your Errors Update

Browse source 
* Add automatic error reporting with Sentry.io
* Filter a bunch of bad errors from showing up on Sentry
* Add module.hasModule method.
* Fix deep_copy
* Fix disallow mouse interaction with extensions
* Add some new icons to the icon font for mod cards
* Allow Ctrl-Shift-Clicking emotes.
* Rarity sorting for experiments and unset display for unused experiments.
This commit is contained in:
SirStendec 2018-04-11 17:05:31 -04:00
parent e3a7e3b64d
commit d7a07a5612
32 changed files with 575 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/modules/chat/emotes.js
View file

@ -195,6 +195,35 @@ export default class Emotes extends Module {
const provider = ds.provider;
if ( event.shiftKey && this.parent.context.get('chat.click-emotes') ) {
let url;
if ( provider === 'twitch' )
url = `https://twitchemotes.com/emotes/${ds.id}`;
else if ( provider === 'ffz' ) {
const emote_set = this.emote_sets[ds.set],
emote = emote_set && emote_set.emotes[ds.id];
if ( ! emote )
return;
if ( emote.click_url )
url = emote.click_url;
else if ( ! emote_set.source )
url = `https://www.frankerfacez.com/emoticons/${emote.id}`;
}
if ( url ) {
const win = window.open();
win.opener = null;
win.location = url;
}
return true;
}
if ( event[MOD_KEY] ) {
// Favoriting Emotes
let source, id;
@ -225,35 +254,6 @@ export default class Emotes extends Module {
return true;
}
if ( event.shiftKey && this.parent.context.get('chat.click-emotes') ) {
let url;
if ( provider === 'twitch' )
url = `https://twitchemotes.com/emotes/${ds.id}`;
else if ( provider === 'ffz' ) {
const emote_set = this.emote_sets[ds.set],
emote = emote_set && emote_set.emotes[ds.id];
if ( ! emote )
return;
if ( emote.click_url )
url = emote.click_url;
else if ( ! emote_set.source )
url = `https://www.frankerfacez.com/emoticons/${emote.id}`;
}
if ( url ) {
const win = window.open();
win.opener = null;
win.location = url;
}
return true;
}
}