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

4.0.0-rc21.1

Browse source 
* Fixed: Minor rendering issue with new feature of In-Line Chat Actions.
This commit is contained in:
SirStendec 2019-05-16 14:51:51 -04:00
parent bd11a6f2aa
commit 7d8151b6d9
3 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main.js
View file

@ -149,7 +149,7 @@ ${typeof x[1] === 'string' ? x[1] : JSON.stringify(x[1], null, 4)}`
FrankerFaceZ.Logger = Logger;
const VER = FrankerFaceZ.version_info = {
major: 4, minor: 0, revision: 0, extra: '-rc21',
major: 4, minor: 0, revision: 0, extra: '-rc21.1',
commit: __git_commit__,
build: __webpack_hash__,
toString: () =>

32
src/modules/chat/actions/index.jsx
View file

@ -494,22 +494,26 @@ export default class Actions extends Module {
type: msg.user.type
});*/
let out = (<div
class="ffz--inline-actions ffz-action-data tw-inline-block tw-mg-r-05"
data-source="line"
>
{actions}
</div>);
let out = null;
if ( actions.length )
out = (<div
class="ffz--inline-actions ffz-action-data tw-inline-block tw-mg-r-05"
data-source="line"
>
{actions}
</div>);
if ( modified.length ) {
return [out,
(<div
class="ffz--inline-actions ffz--modifier-actions ffz-action-data"
data-source="line"
>
{modified}
</div>)
];
const modified_out = (<div
class="ffz--inline-actions ffz--modifier-actions ffz-action-data"
data-source="line"
>
{modified}
</div>);
if ( out )
return [out, modified_out];
return modified_out;
}
return out;

1
styles/chat.scss
View file

@ -63,6 +63,7 @@
top: 0;
left: 0;
padding: .5rem 0;
z-index: 1;
background: rgba(255,255,255,0.5);