specter/mastodon
1
0
Fork 1
forked from fedi/mastodon
Code Pull requests Activity

Allow == when null checking (#24593)

Browse source
This commit is contained in:
fusagiko / takayamaki 2023-04-20 00:46:46 +09:00 committed by GitHub
parent e98c86050a
commit c1a7e38d2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.eslintrc.js
View file

@ -71,7 +71,7 @@ module.exports = {
'comma-style': ['warn', 'last'], 'comma-style': ['warn', 'last'],
'consistent-return': 'error', 'consistent-return': 'error',
'dot-notation': 'error', 'dot-notation': 'error',
eqeqeq: 'error', eqeqeq: ['error', 'always', { 'null': 'ignore' }],
indent: ['warn', 2], indent: ['warn', 2],
'jsx-quotes': ['error', 'prefer-single'], 'jsx-quotes': ['error', 'prefer-single'],
'no-case-declarations': 'off', 'no-case-declarations': 'off',

3
app/javascript/mastodon/components/short_number.jsx
View file

@ -32,17 +32,14 @@ function ShortNumber({ value, renderer, children }) {
const shortNumber = toShortNumber(value); const shortNumber = toShortNumber(value);
const [, division] = shortNumber; const [, division] = shortNumber;
// eslint-disable-next-line eqeqeq
if (children != null && renderer != null) { if (children != null && renderer != null) {
console.warn('Both renderer prop and renderer as a child provided. This is a mistake and you really should fix that. Only renderer passed as a child will be used.'); console.warn('Both renderer prop and renderer as a child provided. This is a mistake and you really should fix that. Only renderer passed as a child will be used.');
} }
// eslint-disable-next-line eqeqeq
const customRenderer = children != null ? children : renderer; const customRenderer = children != null ? children : renderer;
const displayNumber = <ShortNumberCounter value={shortNumber} />; const displayNumber = <ShortNumberCounter value={shortNumber} />;
// eslint-disable-next-line eqeqeq
return customRenderer != null return customRenderer != null
? customRenderer(displayNumber, pluralReady(value, division)) ? customRenderer(displayNumber, pluralReady(value, division))
: displayNumber; : displayNumber;

1
app/javascript/mastodon/utils/numbers.js
View file

@ -60,7 +60,6 @@ export function toShortNumber(sourceNumber) {
* // => 1790 * // => 1790
*/ */
export function pluralReady(sourceNumber, division) { export function pluralReady(sourceNumber, division) {
// eslint-disable-next-line eqeqeq
if (division == null || division < DECIMAL_UNITS.HUNDRED) { if (division == null || division < DECIMAL_UNITS.HUNDRED) {
return sourceNumber; return sourceNumber;
} }