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

3.5.252. Emoji changes. Fix the Following tooltip and count. Tweaks to the custom getPlayerInfo method to improve its output's accuracy.

Browse source
This commit is contained in:
SirStendec 2016-07-17 14:04:19 -04:00
parent ba084cfaa9
commit 86546ba7d8
8 changed files with 120 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/ext/betterttv.js
View file

@ -91,10 +91,6 @@ FFZ.prototype.setup_bttv = function(delay) {
this.toggle_style('chat-separator-3d-inset');
this.toggle_style('chat-separator-wide');
/*this.toggle_style('chat-hc-text');
this.toggle_style('chat-hc-bold');
this.toggle_style('chat-hc-background');*/
this.toggle_style('chat-colors-gray');
this.toggle_style('badges-rounded');
this.toggle_style('badges-circular');
@ -244,9 +240,6 @@ FFZ.prototype.setup_bttv = function(delay) {
segments = token.split(constants.EMOJI_REGEX),
text = null;
if ( setting === 0 )
return [token];
while(segments.length) {
text = (text || '') + segments.shift();
if ( segments.length ) {
@ -258,8 +251,16 @@ FFZ.prototype.setup_bttv = function(delay) {
if ( src ) {
if ( text && text.length )
output.push(text);
var code = utils.quote_attr(data.raw);
output.push(['<img class="emoticon emoji ffz-tooltip" height="18px" data-ffz-emoji="' + eid + '" src="' + utils.quote_attr(src) + '" alt="' + code + '">']);
// We still want to use a special token even if emoji display is disabled
// as, otherwise, BTTV will render the emoji itself, which the user has no
// way of disabling if not for this.
if ( setting === 0 )
output.push([data.raw]);
else {
var code = utils.quote_attr(data.raw);
output.push(['<img class="emoticon emoji ffz-tooltip" height="18px" data-ffz-emoji="' + eid + '" src="' + utils.quote_attr(src) + '" alt="' + code + '">']);
}
text = null;
} else
text = (text || '') + match;