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

Fixed some hard-coded HTTP protocols. Moved betterttv into ext/ folder. Added support for Emote Menu for Twitch. Added support for non-critical WebSocket calls that wait till the socket is connected.

Browse source
This commit is contained in:
SirStendec 2015-01-19 15:27:10 -05:00
parent 2c3af2d51e
commit 3d3c1f9716
12 changed files with 434 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/emoticons.js
View file

@ -1,5 +1,6 @@
var FFZ = window.FrankerFaceZ,
CSS = /\.([\w\-_]+)\s*?\{content:\s*?"([^"]+)";\s*?background-image:\s*?url\("([^"]+)"\);\s*?height:\s*?(\d+)px;\s*?width:\s*?(\d+)px;\s*?margin:([^;}]+);?([^}]*)\}/mg,
MOD_CSS = /[^\n}]*\.badges\s+\.moderator\s*{\s*background-image:\s*url\(\s*['"]([^'"]+)['"][^}]+(?:}|$)/,
constants = require('./constants'),
utils = require('./utils'),
@ -173,7 +174,7 @@ FFZ.prototype._legacy_load_set = function(set_id, callback, tries) {
FFZ.prototype._legacy_load_css = function(set_id, callback, data) {
var emotes = {}, output = {id: set_id, emotes: emotes, extra_css: null}, f = this;
data.replace(CSS, function(match, klass, name, path, height, width, margins, extra) {
data = data.replace(CSS, function(match, klass, name, path, height, width, margins, extra) {
height = parseInt(height); width = parseInt(width);
margins = check_margins(margins, height);
var hidden = path.substr(path.lastIndexOf("/") + 1, 1) === ".",
@ -182,7 +183,15 @@ FFZ.prototype._legacy_load_css = function(set_id, callback, data) {
emotes[id] = emote;
return "";
});
}).trim();
if ( data )
data.replace(MOD_CSS, function(match, url) {
if ( output.icon || url.substr(-11) !== 'modicon.png' )
return;
output.icon = url;
});
this._load_set_json(set_id, callback, output);
}