Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Commit

Permalink
update eslint's comma-dangle rule to always-multiline. (#830)
Browse files Browse the repository at this point in the history
* update eslint's `comma-dangle` rule to `always-multiline`

* Invoke `yarn fix` to adopt the updated eslint rules. No other changes are included.
  • Loading branch information
lieut-data committed Feb 21, 2018
1 parent e93497b commit 27a5b77
Show file tree
Hide file tree
Showing 721 changed files with 3,698 additions and 3,698 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"camelcase": [2, {"properties": "never"}],
"capitalized-comments": 0,
"class-methods-use-this": 0,
"comma-dangle": [2, "never"],
"comma-dangle": [2, "always-multiline"],
"comma-spacing": [2, {"before": false, "after": true}],
"comma-style": [2, "last"],
"complexity": [1, 10],
Expand Down
8 changes: 4 additions & 4 deletions actions/admin_actions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -283,20 +283,20 @@ export async function elasticsearchPurgeIndexes(success, error) {
export function setNavigationBlocked(blocked) {
return {
type: ActionTypes.SET_NAVIGATION_BLOCKED,
blocked
blocked,
};
}

export function deferNavigation(onNavigationConfirmed) {
return {
type: ActionTypes.DEFER_NAVIGATION,
onNavigationConfirmed
onNavigationConfirmed,
};
}

export function cancelNavigation() {
return {
type: ActionTypes.CANCEL_NAVIGATION
type: ActionTypes.CANCEL_NAVIGATION,
};
}

Expand All @@ -310,7 +310,7 @@ export function confirmNavigation() {
}

thunkDispatch({
type: ActionTypes.CONFIRM_NAVIGATION
type: ActionTypes.CONFIRM_NAVIGATION,
});
};
}
4 changes: 2 additions & 2 deletions actions/channel_actions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export async function openDirectChannelToUser(userId, success, error) {
const currentUserId = UserStore.getCurrentId();
savePreferences(currentUserId, [
{user_id: currentUserId, category: Preferences.CATEGORY_DIRECT_CHANNEL_SHOW, name: userId, value: 'true'},
{user_id: currentUserId, category: Preferences.CATEGORY_CHANNEL_OPEN_TIME, name: channel.id, value: now.toString()}
{user_id: currentUserId, category: Preferences.CATEGORY_CHANNEL_OPEN_TIME, name: channel.id, value: now.toString()},
])(dispatch, getState);

if (success) {
Expand Down Expand Up @@ -248,7 +248,7 @@ export function unmarkFavorite(channelId) {
const pref = {
user_id: currentUserId,
category: Preferences.CATEGORY_FAVORITE_CHANNEL,
name: channelId
name: channelId,
};

deletePreferences(currentUserId, [pref])(dispatch, getState);
Expand Down
8 changes: 4 additions & 4 deletions actions/diagnostics_actions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@ const SUPPORTS_MEASURE_METHODS = isSupported([
performance.measure,
performance.getEntries,
performance.getEntriesByName,
performance.clearMeasures
performance.clearMeasures,
]);

export function trackEvent(category, event, props) {
if (global.window && global.window.analytics) {
const properties = Object.assign({category, type: event, user_actual_id: UserStore.getCurrentId()}, props);
const options = {
context: {
ip: '0.0.0.0'
ip: '0.0.0.0',
},
page: {
path: '',
referrer: '',
search: '',
title: '',
url: ''
url: '',
},
anonymousId: '00000000000000000000000000'
anonymousId: '00000000000000000000000000',
};
global.window.analytics.track('event', properties, options);
}
Expand Down
4 changes: 2 additions & 2 deletions actions/emoji_actions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export async function deleteEmoji(emojiId, success, error) {
// Needed to remove recently used emoji
AppDispatcher.handleServerAction({
type: ActionTypes.REMOVED_CUSTOM_EMOJI,
id: emojiId
id: emojiId,
});

if (success) {
Expand Down Expand Up @@ -58,7 +58,7 @@ export function loadRecentlyUsedCustomEmojis() {
export function incrementEmojiPickerPage() {
return async (dispatch) => {
dispatch({
type: ActionTypes.INCREMENT_EMOJI_PICKER_PAGE
type: ActionTypes.INCREMENT_EMOJI_PICKER_PAGE,
});

return {data: true};
Expand Down
10 changes: 5 additions & 5 deletions actions/file_actions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export function uploadFile(file, name, channelId, clientId, successCallback, err
clientIds: [clientId],
channelId,
rootId: null,
error: err
error: err,
};

dispatch(batchActions([failure, getLogErrorAction(err)]), getState);
Expand All @@ -44,7 +44,7 @@ export function uploadFile(file, name, channelId, clientId, successCallback, err
const data = res.body.file_infos.map((fileInfo, index) => {
return {
...fileInfo,
clientId: res.body.client_ids[index]
clientId: res.body.client_ids[index],
};
});

Expand All @@ -53,11 +53,11 @@ export function uploadFile(file, name, channelId, clientId, successCallback, err
type: FileTypes.RECEIVED_UPLOAD_FILES,
data,
channelId,
rootId: null
rootId: null,
},
{
type: FileTypes.UPLOAD_FILES_SUCCESS
}
type: FileTypes.UPLOAD_FILES_SUCCESS,
},
]), getState);

if (successCallback) {
Expand Down
Loading

0 comments on commit 27a5b77

Please sign in to comment.