oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-27 04:58:30 +00:00
Code Wiki Activity

3.5.409. Fix player positioning. Fix cheer rendering with hashtags. Add option to hide cheering with #charity notices. Fix highlight notices not appearing. Fix clicking a dashboard widget's settings balloon. Dark CSS fixes for dashboard and clips updates. Refactor CSS for chatlines to remove the need for :before. Fix debug logging never finishing when the client fails to get a logviewer token.

Browse source
This commit is contained in:
SirStendec 2016-12-23 13:40:05 -05:00
parent 1b9b695bdd
commit 6b13ac3265
24 changed files with 286 additions and 344 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/tokenize.js
View file

@ -667,8 +667,8 @@ FFZ.prototype._tokenize_bits = function(tokens) {
if ( bits_helpers && bits_helpers.tokenizeBits )
try {
return bits_helpers.tokenizeBits(tokens,
bits_tags && bits_tags.allTagNames,
bits_service && bits_service.regexes);
bits_tags && bits_tags.get('allTagNames'),
bits_service && bits_service.get('regexes'));
} catch(err) { }
return tokens;
@ -802,10 +802,15 @@ FFZ.prototype.tokenize_chat_line = function(msgObject, prevent_notification, del
// can't actually go to it is a bad thing.
if ( this._chatv && this.settings.highlight_notifications && ! this.embed_in_dash && ! document.hasFocus() && ! prevent_notification ) {
var room = this.rooms[room_id] && this.rooms[room_id].room,
controller = utils.ember_lookup('controller:chat'),
room_name;
// Make sure we have UI for this channel.
if ( (this.settings.group_tabs && (this.settings.pinned_rooms.indexOf(room_id) !== -1 || this._chatv._ffz_host )) || room.get('isGroupRoom') || room === this._chatv.get('controller.currentChannelRoom') ) {
if ( this.settings.pinned_rooms.indexOf(room_id) !== -1 ||
room_id === this._chatv._ffz_host ||
room.get('isGroupRoom') ||
(controller && room === controller.get('currentChannelRoom')) ) {
if ( room && room.get('isGroupRoom') )
room_name = room.get('tmiRoom.displayName');
else
@ -837,8 +842,7 @@ FFZ.prototype.tokenize_chat_line = function(msgObject, prevent_notification, del
(this.settings.notification_timeout*1000),
function() {
window.focus();
var cont = utils.ember_lookup('controller:chat');
room && cont && cont.focusRoom(room);
room && controller && controller.focusRoom(room);
}
);
}
@ -1067,6 +1071,10 @@ FFZ.prototype.render_token = function(render_links, warn_links, render_bits, tok
return '<span class="emoticon ffz-bit ffz-tooltip bit-prefix-' + prefix + ' bit-tier-' + tier[0] + '"' + (token.individuals ? ' data-individuals="' + utils.quote_attr(JSON.stringify(token.individuals)) + '"' : '') + ' data-prefix="' + prefix + '" data-amount="' + utils.number_commas(token.amount) + '" alt="cheer' + token.amount + '"></span>';
}
else if ( token.type === 'bits-tag' ) {
return '<span class="bits-tag mentioning">' + utils.sanitize(token.tag) + '</span>';
}
else if ( token.type === "deleted" )
return '<span class="deleted-word html-tooltip" title="' + utils.quote_san(token.text) + '" data-text="' + utils.sanitize(token.text) + '">&times;&times;&times;</span>';
//return `<span class="deleted-word html-tooltip" title="${utils.quote_attr(token.text)}" data-text="${utils.sanitize(token.text)}">&times;&times;&times;</span>`;