Updating client dependancies and ESLint (#2954)
* Updating client dependancies * Fixing eslint errors with updates * Updating eslint
Этот коммит содержится в:
коммит произвёл
Joram Wilander
родитель
a3cfdf0483
Коммит
4b260b761a
@@ -230,11 +230,11 @@ class CustomThemeChooser extends React.Component {
|
||||
overlay={popoverContent}
|
||||
ref='headerOverlay'
|
||||
>
|
||||
<span className='input-group-addon'>
|
||||
<img
|
||||
src={codeThemeURL}
|
||||
/>
|
||||
</span>
|
||||
<span className='input-group-addon'>
|
||||
<img
|
||||
src={codeThemeURL}
|
||||
/>
|
||||
</span>
|
||||
</OverlayTrigger>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -81,7 +81,7 @@ class ImportThemeModal extends React.Component {
|
||||
theme.mentionHighlightLink = '#2f81b7';
|
||||
theme.codeTheme = 'github';
|
||||
|
||||
let user = UserStore.getCurrentUser();
|
||||
const user = UserStore.getCurrentUser();
|
||||
user.theme_props = theme;
|
||||
|
||||
Client.updateUser(user,
|
||||
|
||||
@@ -59,6 +59,7 @@ export default class PremadeThemeChooser extends React.Component {
|
||||
<a
|
||||
href='http://docs.mattermost.com/help/settings/theme-colors.html#custom-theme-examples'
|
||||
target='_blank'
|
||||
rel='noopener noreferrer'
|
||||
>
|
||||
<FormattedMessage
|
||||
id='user.settings.display.theme.otherThemes'
|
||||
|
||||
@@ -150,13 +150,13 @@ class NotificationsTab extends React.Component {
|
||||
data.channel = this.state.channelKey.toString();
|
||||
|
||||
Client.updateUserNotifyProps(data,
|
||||
function success() {
|
||||
() => {
|
||||
this.props.updateSection('');
|
||||
AsyncClient.getMe();
|
||||
}.bind(this),
|
||||
function failure(err) {
|
||||
},
|
||||
(err) => {
|
||||
this.setState({serverError: err.message});
|
||||
}.bind(this)
|
||||
}
|
||||
);
|
||||
}
|
||||
handleCancel(e) {
|
||||
@@ -254,7 +254,8 @@ class NotificationsTab extends React.Component {
|
||||
<div key='userNotificationLevelOption'>
|
||||
<div className='radio'>
|
||||
<label>
|
||||
<input type='radio'
|
||||
<input
|
||||
type='radio'
|
||||
checked={notifyActive[0]}
|
||||
onChange={this.handleNotifyRadio.bind(this, 'all')}
|
||||
/>
|
||||
@@ -393,8 +394,8 @@ class NotificationsTab extends React.Component {
|
||||
/>
|
||||
</label>
|
||||
<br/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
const extraInfo = (
|
||||
|
||||
@@ -608,11 +608,11 @@ class SecurityTab extends React.Component {
|
||||
const inputs = [];
|
||||
inputs.push(
|
||||
<div key='userSignInOption'>
|
||||
{emailOption}
|
||||
{gitlabOption}
|
||||
<br/>
|
||||
{ldapOption}
|
||||
{googleOption}
|
||||
{emailOption}
|
||||
{gitlabOption}
|
||||
<br/>
|
||||
{ldapOption}
|
||||
{googleOption}
|
||||
</div>
|
||||
);
|
||||
|
||||
|
||||
@@ -212,7 +212,8 @@ export default class ThemeSetting extends React.Component {
|
||||
key='premadeThemeColorLabel'
|
||||
>
|
||||
<label>
|
||||
<input type='radio'
|
||||
<input
|
||||
type='radio'
|
||||
checked={!displayCustom}
|
||||
onChange={this.updateType.bind(this, 'premade')}
|
||||
/>
|
||||
@@ -233,7 +234,8 @@ export default class ThemeSetting extends React.Component {
|
||||
key='customThemeColorLabel'
|
||||
>
|
||||
<label>
|
||||
<input type='radio'
|
||||
<input
|
||||
type='radio'
|
||||
checked={displayCustom}
|
||||
onChange={this.updateType.bind(this, 'custom')}
|
||||
/>
|
||||
|
||||
Ссылка в новой задаче
Block a user