oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-21 21:40:54 +00:00
Code Wiki Activity

3.5.156. Feed Cards. CSS tweaks. Fixed Golden Kappa's tooltip. Not much here.

Browse source
This commit is contained in:
SirStendec 2016-04-11 18:57:25 -04:00
parent 9ead660f89
commit 21d1ce0d8f
12 changed files with 130 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/emoticons.js
View file

@ -8,7 +8,7 @@ var FFZ = window.FrankerFaceZ,
if ( ! emote.margins && ! emote.css )
return "";
return 'img[src="' + emote.urls[1] + '"] { ' + (emote.margins ? "margin: " + emote.margins + ";" : "") + (emote.css || "") + " }\n";
return 'img[data-ffz-emote="' + emote.id + '"] { ' + (emote.margins ? "margin: " + emote.margins + ";" : "") + (emote.css || "") + " }\n";
};
@ -413,7 +413,7 @@ FFZ.prototype._load_set_json = function(set_id, callback, data) {
if ( this._inputv )
Ember.propertyDidChange(this._inputv, 'ffz_emoticons');
this.rerender_feed_cards();
this.rerender_feed_cards(set_id);
if ( callback )
callback(true, data);