Browse Source

Remove comments for eslint-disable (#3691)

closed-social-glitch-2
Yamagishi Kazutoshi 6 years ago
committed by Eugen Rochko
parent
commit
3690f04e4a
8 changed files with 11 additions and 13 deletions
  1. +4
    -1
      .eslintrc.yml
  2. +4
    -2
      app/javascript/mastodon/features/notifications/components/notification.js
  3. +1
    -1
      app/javascript/mastodon/middleware/errors.js
  4. +1
    -1
      app/javascript/packs/application.js
  5. +1
    -1
      app/javascript/packs/public.js
  6. +0
    -2
      config/webpack/production.js
  7. +0
    -3
      config/webpack/shared.js
  8. +0
    -2
      config/webpack/translationRunner.js

+ 4
- 1
.eslintrc.yml View File

@ -43,7 +43,10 @@ rules:
- prefer-single
no-catch-shadow: error
no-cond-assign: error
no-console: warn
no-console:
- warn
- allow:
- error
no-fallthrough: error
no-irregular-whitespace: error
no-mixed-spaces-and-tabs: warn

+ 4
- 2
app/javascript/mastodon/features/notifications/components/notification.js View File

@ -65,11 +65,11 @@ class Notification extends ImmutablePureComponent {
);
}
render () { // eslint-disable-line consistent-return
render () {
const { notification } = this.props;
const account = notification.get('account');
const displayName = account.get('display_name').length > 0 ? account.get('display_name') : account.get('username');
const displayNameHTML = { __html: emojify(escapeTextContentForBrowser(displayName)) };
const displayNameHTML = { __html: emojify(escapeTextContentForBrowser(displayName)) };
const link = <Permalink className='notification__display-name' href={account.get('url')} title={account.get('acct')} to={`/accounts/${account.get('id')}`} dangerouslySetInnerHTML={displayNameHTML} />;
switch(notification.get('type')) {
@ -82,6 +82,8 @@ class Notification extends ImmutablePureComponent {
case 'reblog':
return this.renderReblog(notification, link);
}
return null;
}
}

+ 1
- 1
app/javascript/mastodon/middleware/errors.js View File

@ -22,7 +22,7 @@ export default function errorsMiddleware() {
dispatch(showAlert(title, message));
} else {
console.error(action.error); // eslint-disable-line no-console
console.error(action.error);
dispatch(showAlert('Oops!', 'An unexpected error occurred.'));
}
}

+ 1
- 1
app/javascript/packs/application.js View File

@ -2,5 +2,5 @@ import main from '../mastodon/main';
import loadPolyfills from '../mastodon/load_polyfills';
loadPolyfills().then(main).catch(e => {
console.error(e); // eslint-disable-line no-console
console.error(e);
});

+ 1
- 1
app/javascript/packs/public.js View File

@ -93,5 +93,5 @@ function main() {
}
loadPolyfills().then(main).catch(error => {
console.log(error); // eslint-disable-line no-console
console.error(error);
});

+ 0
- 2
config/webpack/production.js View File

@ -1,7 +1,5 @@
// Note: You must restart bin/webpack-dev-server for changes to take effect
/* eslint global-require: 0 */
const webpack = require('webpack');
const merge = require('webpack-merge');
const CompressionPlugin = require('compression-webpack-plugin');

+ 0
- 3
config/webpack/shared.js View File

@ -1,8 +1,5 @@
// Note: You must restart bin/webpack-dev-server for changes to take effect
/* eslint global-require: 0 */
/* eslint import/no-dynamic-require: 0 */
const { existsSync } = require('fs');
const webpack = require('webpack');
const { basename, dirname, join, relative, resolve, sep } = require('path');

+ 0
- 2
config/webpack/translationRunner.js View File

@ -38,7 +38,6 @@ const validateLanguages = (languages, validators) => {
}, []);
if (invalidLanguages.length > 0) {
// eslint-disable-next-line no-console
console.error(`
Error: Specified invalid LANGUAGES:
${invalidLanguages.map(({ language, error }) => `* ${language}: ${error.message}`).join('\n')}
@ -73,7 +72,6 @@ ${availableLanguages.join(', ')}
// check if message directory exists
if (!fs.existsSync(messagesDirectory)) {
// eslint-disable-next-line no-console
console.error(`
Error: messagesDirectory not exists
(${messagesDirectory})

Loading…
Cancel
Save