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

BetterTTV Integration

Browse source
This commit is contained in:
SirStendec 2015-01-15 13:58:42 -05:00
parent cc71863800
commit 4e6942e2f3
11 changed files with 576 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/emoticons.js
View file

@ -80,13 +80,15 @@ var build_legacy_css = function(emote) {
return ".ffz-emote-" + emote.id + ' { background-image: url("' + emote.url + '"); height: ' + emote.height + "px; width: " + emote.width + "px; margin: " + margin + (emote.extra_css ? "; " + emote.extra_css : "") + "}\n";
}
var build_css = function(emote) {
var build_new_css = function(emote) {
if ( ! emote.margins && ! emote.extra_css )
return "";
return build_legacy_css(emote);
return 'img[src="' + emote.url + '"] { ' + (emote.margins ? "margin: " + emote.margins + ";" : "") + (emote.extra_css || "") + " }\n";
return build_legacy_css(emote) + 'img[src="' + emote.url + '"] { ' + (emote.margins ? "margin: " + emote.margins + ";" : "") + (emote.extra_css || "") + " }\n";
}
var build_css = build_new_css;
FFZ.prototype._load_set_json = function(set_id, callback, data) {
@ -94,6 +96,7 @@ FFZ.prototype._load_set_json = function(set_id, callback, data) {
this.emote_sets[set_id] = data;
data.users = [];
data.global = false;
data.count = 0;
// Iterate through all the emoticons, building CSS and regex objects as appropriate.
var output_css = "";
@ -111,10 +114,12 @@ FFZ.prototype._load_set_json = function(set_id, callback, data) {
emote.regex = new RegExp("\\b" + emote.name + "\\b", "g");
output_css += build_css(emote);
data.count++;
}
utils.update_css(this._emote_style, set_id, output_css + (data.extra_css || ""));
this.log("Updated emoticons for set: " + set_id, data);
this.update_ui_link();
if ( callback )
callback(true, data);