oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-03 16:38:31 +00:00
Code Wiki Activity

The In-Line Actions Update

Browse source 
* Add extensible actions system.
* Add extensive UI for configuring the actions system.
* Add setting to disable channel hosting.
* Fix the stupid Rooms thing popping up every time you open a channel.
* Fix how we grab chat types from React.
* Refactor how we handle incoming chat messages.
* Add a hook for outgoing chat messages.
* Fix emoji appearing squished with baseline emote alignment.
* Display arrows on balloons.
* Fix an issue generating emoji URLs.
* Do not use the default values for settings with merge strategies if profiles have those settings, just empty.
* Display a message in the chat settings menu if we tried opening FFZ's settings and failed.
* Wait a bit for webpack's loader if it's not immediately there for some reason.
* Probably other stuff.
* Not mod cards. Yet.
This commit is contained in:
SirStendec 2018-04-28 17:56:03 -04:00
parent e9214bb46a
commit fdde05030f
67 changed files with 7689 additions and 226 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/settings/types.js
View file

@ -33,7 +33,7 @@ export const object_merge = {
values.unshift(val);
}
if ( values.length )
if ( sources.length )
return [
Object.assign({}, ...values),
sources
@ -57,6 +57,8 @@ export const array_merge = {
trailing = [],
sources = [];
let had_value = false;
for(const profile of profiles)
if ( profile.has(key) ) {
const value = profile.get(key);
@ -68,6 +70,7 @@ export const array_merge = {
sources.push(profile.id);
let is_trailing = false;
for(const val of value) {
had_value = true;
if ( val.t === 'inherit' )
is_trailing = true;
else if ( is_trailing )
@ -81,7 +84,7 @@ export const array_merge = {
break;
}
if ( values.length || trailing.length )
if ( had_value )
return [
values.concat(trailing),
sources