matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'eslint-recommended' into 'develop'

Browse Source 
eslint: extend 'eslint:recommended'

See merge request soapbox-pub/soapbox-fe!661
This commit is contained in:
Alex Gleason
2021-08-03 19:57:41 +00:00
parent 497b6b08d4 594cf088ed
commit dcd964dba9
19 changed files with 51 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/soapbox/features/admin/components/report_status.js
View File

@@ -43,7 +43,7 @@ class ReportStatus extends ImmutablePureComponent {
if (status.get('media_attachments').size > 0) {
if (status.get('media_attachments').some(item => item.get('type') === 'unknown')) {
// Do nothing
} else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
const video = status.getIn(['media_attachments', 0]);

2
app/soapbox/features/compose/util/url_regex.js
View File

@@ -31,7 +31,7 @@ const stringSupplant = function(str, values) {
};
export const urlRegex = (function() {
regexen.spaces_group = /\x09-\x0D\x20\x85\xA0\u1680\u180E\u2000-\u200A\u2028\u2029\u202F\u205F\u3000/;
regexen.spaces_group = /\x09-\x0D\x20\x85\xA0\u1680\u180E\u2000-\u200A\u2028\u2029\u202F\u205F\u3000/; // eslint-disable-line no-control-regex
regexen.invalid_chars_group = /\uFFFE\uFEFF\uFFFF\u202A-\u202E/;
regexen.punct = /\!'#%&'\(\)*\+,\\\-\.\/:;<=>\?@\[\]\^_{|}~\$/;
regexen.validUrlPrecedingChars = regexSupplant(/(?:[^A-Za-z0-9@＠$#＃#{invalid_chars_group}]|^)/);

11
app/soapbox/features/emoji/emoji_utils.js
View File

@@ -70,7 +70,6 @@ const stringFromCodePoint = _String.fromCodePoint || function() {
return result;
};
const _JSON = JSON;
const COLONS_REGEX = /^(?:\:([^\:]+)\:)(?:\:skin-tone-(\d)\:)?$/;
@@ -131,19 +130,19 @@ function getData(emoji, skin, set) {
}
}
if (data.short_names.hasOwnProperty(emoji)) {
if (Object.prototype.hasOwnProperty.call(data.short_names, emoji)) {
emoji = data.short_names[emoji];
}
if (data.emojis.hasOwnProperty(emoji)) {
if (Object.prototype.hasOwnProperty.call(data.emojis, emoji)) {
emojiData = data.emojis[emoji];
}
} else if (emoji.id) {
if (data.short_names.hasOwnProperty(emoji.id)) {
if (Object.prototype.hasOwnProperty.call(data.short_names, emoji.id)) {
emoji.id = data.short_names[emoji.id];
}
if (data.emojis.hasOwnProperty(emoji.id)) {
if (Object.prototype.hasOwnProperty.call(data.emojis, emoji.id)) {
emojiData = data.emojis[emoji.id];
skin = skin || emoji.skin;
}
@@ -212,7 +211,7 @@ function deepMerge(a, b) {
const originalValue = a[key];
let value = originalValue;
if (b.hasOwnProperty(key)) {
if (Object.prototype.hasOwnProperty.call(b, key)) {
value = b[key];
}

2
app/soapbox/features/report/components/status_check_box.js
View File

@@ -26,7 +26,7 @@ export default class StatusCheckBox extends React.PureComponent {
if (status.get('media_attachments').size > 0) {
if (status.get('media_attachments').some(item => item.get('type') === 'unknown')) {
// Do nothing
} else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
const video = status.getIn(['media_attachments', 0]);

2
app/soapbox/features/status/components/action_bar.js
View File

@@ -244,7 +244,7 @@ class ActionBar extends React.PureComponent {
textarea.select();
document.execCommand('copy');
} catch (e) {
// Do nothing
} finally {
document.body.removeChild(textarea);
}

2
app/soapbox/features/ui/index.js
View File

@@ -336,7 +336,7 @@ class UI extends React.PureComponent {
try {
e.dataTransfer.dropEffect = 'copy';
} catch (err) {
// Do nothing
}
return false;