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

3.5.37 to 3.5.40. Added Twitch emote mirror. Fixed emote sorting in My Emoticons. Fixed failure to leave chat rooms. Added /ffz reload chat command. Fixed Stream Latency again. Added new API methods. Made settings.get try to load unloaded settings.

Browse source
This commit is contained in:
SirStendec 2015-10-27 14:25:13 -04:00
parent d934508b04
commit acc0010247
15 changed files with 295 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/ui/menu.js
View file

@ -616,9 +616,17 @@ FFZ.prototype._emotes_for_sets = function(parent, view, sets, header, image, sub
s.addEventListener('click', function(id, code, e) {
e.preventDefault();
if ( (e.shiftKey || e.shiftLeft) && f.settings.clickable_emoticons && ! set.hasOwnProperty('source_ext') )
window.open("https://www.frankerfacez.com/emoticons/" + id);
else
if ( (e.shiftKey || e.shiftLeft) && f.settings.clickable_emoticons ) {
var url;
if ( set.hasOwnProperty('source_ext') ) {
var api = f._apis[set.source_ext];
if ( api && api.emote_url_generator )
url = api.emote_url_generator(set.source_id, id);
} else
url = "https://www.frankerfacez.com/emoticons/" + id;
if ( url )
window.open(url);
} else
this._add_emote(view, code);
}.bind(this, emote.id, emote.name));