Fixed syntax & linted

pull/682/head
Vincent 5 years ago
parent a6fb54233a
commit 533ec4eedc

@ -1308,11 +1308,16 @@ class LokiPublicChannelAPI {
// filter out invalid messages // filter out invalid messages
pendingMessages = pendingMessages.filter(messageData => !!messageData); pendingMessages = pendingMessages.filter(messageData => !!messageData);
// separate messages coming from primary and secondary devices // separate messages coming from primary and secondary devices
const [primaryMessages, slaveMessages] = _.partition(pendingMessages, message => !(message.source in slavePrimaryMap)); const [primaryMessages, slaveMessages] = _.partition(
pendingMessages,
message => !(message.source in slavePrimaryMap)
);
// process primary devices' message directly // process primary devices' message directly
primaryMessages.forEach(message => this.serverAPI.chatAPI.emit('publicMessage', { primaryMessages.forEach(message =>
this.serverAPI.chatAPI.emit('publicMessage', {
message, message,
})); })
);
pendingMessages = []; // allow memory to be freed pendingMessages = []; // allow memory to be freed

@ -1,4 +1,3 @@
/* global i18n, Whisper */ /* global i18n, Whisper */
// eslint-disable-next-line func-names // eslint-disable-next-line func-names

@ -1,22 +1,15 @@
$session-color-green: #00F782; $session-color-green: #00f782;
$session-color-white: #fff; $session-color-white: #fff;
$session-color-black: #000; $session-color-black: #000;
$session-font-family: Waza; $session-font-family: Waza;
$session-transition-duration: 0.25s; $session-transition-duration: 0.25s;
$session-icon-size-sm: 16px; $session-icon-size-sm: 16px;
$session-icon-size-md: 20px; $session-icon-size-md: 20px;
$session-icon-size-lg: 28px; $session-icon-size-lg: 28px;
.content{
background-color: $session-color-black !important;
}
.session-button { .session-button {
min-width: 165px; min-width: 165px;
width: auto; width: auto;
@ -33,9 +26,9 @@ $session-icon-size-lg: 28px;
@mixin transparent-background($textAndBorderColor) { @mixin transparent-background($textAndBorderColor) {
background-color: Transparent; background-color: Transparent;
background-repeat:no-repeat; background-repeat: no-repeat;
overflow: hidden; overflow: hidden;
outline:none; outline: none;
color: $textAndBorderColor; color: $textAndBorderColor;
border: 2px solid $textAndBorderColor; border: 2px solid $textAndBorderColor;
} }
@ -52,8 +45,7 @@ $session-icon-size-lg: 28px;
&.white { &.white {
@include transparent-background($session-color-white); @include transparent-background($session-color-white);
} }
} }
.session-icon-button { .session-icon-button {
fill: $session-color-white; fill: $session-color-white;
@ -101,7 +93,7 @@ $session-icon-size-lg: 28px;
} }
} }
&:hover{ &:hover {
opacity: 1; opacity: 1;
} }
} }

@ -26,6 +26,5 @@
@import 'modules'; @import 'modules';
@import 'session'; @import 'session';
// Installer // Installer
@import 'options'; @import 'options';

@ -15,24 +15,19 @@ interface Props {
buttonType: SessionButtonTypes; buttonType: SessionButtonTypes;
} }
export class SessionButton extends React.PureComponent<Props> { export class SessionButton extends React.PureComponent<Props> {
public render() { public render() {
const { const { buttonType, text } = this.props;
buttonType,
text
} = this.props;
return ( return (
<div <div
className={classNames( className={classNames(
'session-button', 'session-button',
buttonType === SessionButtonTypes.green? 'green' : '', buttonType === SessionButtonTypes.green ? 'green' : '',
buttonType === SessionButtonTypes.fullGreen? 'full-green' : '', buttonType === SessionButtonTypes.fullGreen ? 'full-green' : '',
buttonType === SessionButtonTypes.white? 'white' : '', buttonType === SessionButtonTypes.white ? 'white' : ''
)} )}
role='button' role="button"
> >
{text} {text}
</div> </div>

@ -1,7 +1,6 @@
import React from 'react'; import React from 'react';
import classNames from 'classnames'; import classNames from 'classnames';
export enum SessionIconButtonTypes { export enum SessionIconButtonTypes {
'exit' = 'exit', 'exit' = 'exit',
'search' = 'search', 'search' = 'search',
@ -24,24 +23,19 @@ export enum SessionIconButtonSizes {
'large' = 'large', 'large' = 'large',
} }
interface Props { interface Props {
iconType: SessionIconButtonTypes; iconType: SessionIconButtonTypes;
iconSize: SessionIconButtonSizes; iconSize: SessionIconButtonSizes;
} }
export class SessionIconButton extends React.PureComponent<Props> { export class SessionIconButton extends React.PureComponent<Props> {
constructor(props: any){ constructor(props: any) {
super(props); super(props);
this.clickHandler = this.clickHandler.bind(this); this.clickHandler = this.clickHandler.bind(this);
} }
public render() { public render() {
const { const { iconType, iconSize } = this.props;
iconType,
iconSize,
} = this.props;
let iconPath = `./images/session/icon-${iconType}.svg`; let iconPath = `./images/session/icon-${iconType}.svg`;
@ -56,17 +50,15 @@ export class SessionIconButton extends React.PureComponent<Props> {
iconSize === SessionIconButtonSizes.medium ? 'medium' : '', iconSize === SessionIconButtonSizes.medium ? 'medium' : '',
iconSize === SessionIconButtonSizes.large ? 'large' : '' iconSize === SessionIconButtonSizes.large ? 'large' : ''
)} )}
role='button' role="button"
onClick={this.clickHandler} onClick={this.clickHandler}
> >
<img src={iconPath}/> <img src={iconPath} />
</div> </div>
); );
} }
clickHandler(){ private clickHandler() {
return; return;
} }
} }
Loading…
Cancel
Save