oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-02 16:08:31 +00:00
Code Wiki Activity

3.5.349. Fix emote CSS generation, the view:room going away thing, add stuff to modifier emotes, fix tab completion. Yay. Closes #49

Browse source
This commit is contained in:
SirStendec 2016-10-25 14:44:22 -04:00
parent 5d3ba8778c
commit 96cfa89351
9 changed files with 476 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/ext/api.js
View file

@ -1,12 +1,5 @@
var FFZ = window.FrankerFaceZ,
utils = require('../utils'),
build_css = function(emote) {
if ( ! emote.margins && ! emote.css )
return "";
return 'img[src="' + emote.urls[1] + '"]{' + (emote.margins ? 'margin:' + emote.margins + ';' : '') + (emote.css || "") + '}'
};
utils = require('../utils');
// ---------------------
@ -209,7 +202,10 @@ API.prototype._load_set = function(real_id, set_id, data) {
new_emote.css = emote.css;
new_emote.margins = emote.margins;
new_emote.modifier = emote.modifier;
new_emote.extra_width = emote.extra_width;
new_emote.shrink_to_fit = emote.shrink_to_fit;
new_emote.srcSet = emote.urls[1] + ' 1x';
new_emote.urls[1] = emote.urls[1];
@ -245,7 +241,7 @@ API.prototype._load_set = function(real_id, set_id, data) {
altText: new_emote.hidden ? '???' : new_emote.name
};
output_css += build_css(new_emote);
output_css += utils.emote_css(new_emote);
emote_set.count++;
emoticons[id] = new_emote;
}