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

3.5.472. Add new Verified badge. Add separate transparent image support for badges. Misc. minor bug fixes.

Browse source
This commit is contained in:
SirStendec 2017-04-22 22:34:22 -04:00
parent e2803a7e1d
commit efaf46ee75
13 changed files with 183 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/ember/chat-input.js
View file

@ -783,7 +783,7 @@ FFZ.prototype.modify_chat_input = function(component) {
room_id = room && room.get('id'),
tmi = in_conversation ? window.TMI && TMI._sessions && TMI._sessions[0] : room && room.tmiSession,
set_name, replacement, url, is_sub_set, fav_list,
set_name, replacement, url, is_inventory, is_sub_set, fav_list,
emote_set, emote, emote_id, code, sort_factor, is_fav,
prefix_length, per_pref,
@ -801,13 +801,17 @@ FFZ.prototype.modify_chat_input = function(component) {
if ( es && es.emoticon_sets ) {
for(var set_id in es.emoticon_sets) {
emote_set = es.emoticon_sets[set_id];
fav_list = f.settings.favorite_emotes['twitch-' + set_id] || [];
is_inventory = f._twitch_inventory_sets.indexOf(set_id) !== -1;
fav_list = f.settings.favorite_emotes['twitch-' + (is_inventory ? 'inventory' : set_id)] || [];
is_sub_set = false;
set_name = f._twitch_set_to_channel[set_id];
if ( ! emote_set )
continue;
if ( set_name ) {
if ( is_inventory )
set_name = 'Twitch Inventory';
else if ( set_name ) {
if ( set_name === '--global--' )
set_name = 'Twitch Global';
else if ( set_name === '--twitch-turbo--' || set_name === 'turbo' || set_name === '--turbo-faces--' )
@ -826,7 +830,7 @@ FFZ.prototype.modify_chat_input = function(component) {
continue;
prefix_length = f.settings.input_complete_without_prefix && is_sub_set ? utils.find_common_prefix(_.pluck(emote_set, 'code'), true) : 0;
sort_factor = is_sub_set ? 1 : 9;
sort_factor = is_sub_set ? 1 : is_inventory ? 8 : 9;
for(var i = 0; i < emote_set.length; i++) {
emote = emote_set[i];

8
src/ember/moderation-card.js
View file

@ -1485,11 +1485,17 @@ FFZ.prototype.modify_moderation_card = function(component) {
room_id = Chat && Chat.get('currentRoom.id'),
user_id = this.get('cardInfo.user.id'),
ffz_room = f.rooms && f.rooms[room_id],
chat_history = ffz_room && ffz_room.user_history && ffz_room.user_history[user_id] || [],
chat_history = ffz_room && ffz_room.user_history ? (ffz_room.user_history[user_id] || []) : null,
el = this.get('element'),
history = el.querySelector('.chat-history.live-history');
if ( chat_history === null ) {
if ( history )
jQuery(history).remove();
return;
}
if ( ! history ) {
history = utils.createElement('ul', 'moderation-card__actions chat-history live-history');
el.appendChild(history);

9
src/ember/sidebar.js
View file

@ -221,10 +221,13 @@ FFZ.settings_info.top_nav_color = {
var out = '.top-nav__menu,.top-nav__drawer-anchor,.top-nav__logo{background-color:' + val + '}';
if ( color.luminance() > 0.2 ) {
out += '.top-nav .notification-center__icon svg,.top-nav .prime-logo-crown.prime-logo-crown--white svg,.top-nav__logo svg path, .top-nav__overflow svg path{fill: #000}' +
out += '.top-nav__search .form__icon svg,.top-nav .notification-center__icon svg,.top-nav .prime-logo-crown.prime-logo-crown--white svg,.top-nav__logo svg path, .top-nav__overflow svg path{fill: #000}' +
'.top-nav__user-card:after{border-top-color:#000}' +
'.top-nav__user-status,.top-nav__nav-link{color: #111}' +
'.top-nav #user_display_name,.top-nav__nav-link:hover{color: #000}';
'.top-nav__nav-link .pill{background-color:rgba(0,0,0,0.2)}' +
'.top-nav__user-status,.ffz-dark .top-nav__nav-link,.top-nav__nav-link{color: #111!important}' +
'.top-nav__nav-link .ffz-follow-count,.top-nav #user_display_name,.ffz-dark .top-nav__nav-link:hover,.top-nav__nav-link:hover{color: #000!important}' +
'.ffz-dark .top-nav__search .form__input[type=text],.top-nav__search .form__input[type=text]{color:#000;background-color:rgba(0,0,0,0.05);box-shadow:rgba(0,0,0,0.2) 0 0 0 1px inset}' +
'.ffz-dark .top-nav__search .form__input[type=text]:focus,.top-nav__search .form__input[type=text]:focus{box-shadow:rgba(0,0,0,0.4) 0 0 0 1px inset}';
} else
out += '.top-nav__nav-link{color: #d7d7d7}';