Skip to content

Commit

Permalink
Updating ESLint
Browse files Browse the repository at this point in the history
  • Loading branch information
@crspeller
crspeller committed Jul 14, 2016
1 parent c67729d commit c28f706
Show file tree
Hide file tree
Showing 15 changed files with 47 additions and 31 deletions.
13 changes: 12 additions & 1 deletion webapp/.eslintrc.json
View file
Expand Up @@ -59,6 +59,7 @@
"keyword-spacing": [2, {"before": true, "after": true, "overrides": {}}],
"linebreak-style": 2,
"lines-around-comment": [2, { "beforeBlockComment": true, "beforeLineComment": true, "allowBlockStart": true, "allowBlockEnd": true }],
"max-lines": [1, {"max": 450, "skipBlankLines": true, "skipComments": false}],
"max-nested-callbacks": [1, {"max":1}],
"max-nested-callbacks": [2, {"max":2}],
"max-statements-per-line": [2, {"max": 1}],
Expand Down Expand Up @@ -92,6 +93,7 @@
"no-extend-native": 2,
"no-extra-bind": 2,
"no-extra-label": 2,
"no-extra-parens": 0,
"no-extra-semi": 2,
"no-fallthrough": 2,
"no-floating-decimal": 2,
Expand All @@ -107,6 +109,7 @@
"no-lonely-if": 2,
"no-loop-func": 2,
"no-magic-numbers": [1, { "ignore": [-1, 0, 1, 2], "enforceConst": true, "detectObjects": true } ],
"no-mixed-operators": [2, {"allowSamePrecedence": false}],
"no-mixed-spaces-and-tabs": 2,
"no-multi-spaces": [2, { "exceptions": { "Property": false } }],
"no-multi-str": 0,
Expand Down Expand Up @@ -152,13 +155,16 @@
"no-useless-concat": 2,
"no-useless-constructor": 2,
"no-useless-escape": 2,
"no-useless-rename": 2,
"no-var": 0,
"no-void": 2,
"no-warning-comments": 1,
"no-whitespace-before-property": 2,
"no-with": 2,
"object-curly-newline": 0,
"object-curly-spacing": [2, "never"],
"object-shorthand": [1, "always"],
"object-property-newline": [2, {"allowMultiplePropertiesPerLine": true}],
"object-shorthand": [2, "always"],
"one-var": [2, "never"],
"one-var-declaration-per-line": 0,
"operator-linebreak": [2, "after"],
Expand Down Expand Up @@ -189,27 +195,32 @@
"react/jsx-no-target-blank": 2,
"react/jsx-no-undef": 2,
"react/jsx-pascal-case": 2,
"react/jsx-filename-extension": 2,
"react/jsx-space-before-closing": [2, "never"],
"react/jsx-uses-react": 2,
"react/jsx-uses-vars": 2,
"react/no-comment-textnodes": 2,
"react/no-danger": 0,
"react/no-deprecated": 2,
"react/no-did-mount-set-state": 2,
"react/no-did-update-set-state": 2,
"react/no-direct-mutation-state": 2,
"react/no-is-mounted": 2,
"react/no-multi-comp": [2, { "ignoreStateless": true }],
"react/no-render-return-value": 2,
"react/no-set-state": 0,
"react/no-string-refs": 0,
"react/no-unknown-property": 2,
"react/prefer-es6-class": 2,
"react/prefer-stateless-function": 0,
"react/prop-types": 2,
"react/require-optimization": 1,
"react/require-render-return": 2,
"react/self-closing-comp": 2,
"react/sort-comp": 0,
"react/wrap-multilines": 2,
"require-yield": 2,
"rest-spread-spacing": [2, "never"],
"semi": [2, "always"],
"semi-spacing": [2, {"before": false, "after": true}],
"sort-imports": 0,
Expand Down
5 changes: 0 additions & 5 deletions webapp/components/admin_console/admin_settings.jsx
View file
Expand Up @@ -106,11 +106,6 @@ export default class AdminSettings extends React.Component {
}

render() {
let saveClass = 'btn';
if (this.state.saveNeeded) {
saveClass += 'btn-primary';
}

return (
<div className='wrapper--fixed'>
{this.renderTitle()}
Expand Down
4 changes: 2 additions & 2 deletions webapp/components/create_comment.jsx
View file
Expand Up @@ -181,7 +181,7 @@ class CreateComment extends React.Component {
}

commentMsgKeyPress(e) {
if (this.state.ctrlSend && e.ctrlKey || !this.state.ctrlSend) {
if ((this.state.ctrlSend && e.ctrlKey) || !this.state.ctrlSend) {
if (e.which === KeyCodes.ENTER && !e.shiftKey && !e.altKey) {
e.preventDefault();
ReactDOM.findDOMNode(this.refs.textbox).blur();
Expand Down Expand Up @@ -313,7 +313,7 @@ class CreateComment extends React.Component {
draft.uploadsInProgress = uploadsInProgress;
PostStore.storeCommentDraft(this.props.rootId, draft);

this.setState({previews: previews, uploadsInProgress: uploadsInProgress});
this.setState({previews, uploadsInProgress});
}

componentWillReceiveProps(newProps) {
Expand Down
2 changes: 1 addition & 1 deletion webapp/components/create_post.jsx
View file
Expand Up @@ -212,7 +212,7 @@ class CreatePost extends React.Component {
}

postMsgKeyPress(e) {
if (this.state.ctrlSend && e.ctrlKey || !this.state.ctrlSend) {
if ((this.state.ctrlSend && e.ctrlKey) || !this.state.ctrlSend) {
if (e.which === KeyCodes.ENTER && !e.shiftKey && !e.altKey) {
e.preventDefault();
ReactDOM.findDOMNode(this.refs.textbox).blur();
Expand Down
3 changes: 2 additions & 1 deletion webapp/components/file_upload.jsx
View file
Expand Up @@ -282,7 +282,8 @@ class FileUpload extends React.Component {
keyUpload(e) {
if (Utils.cmdOrCtrlPressed(e) && e.keyCode === Constants.KeyCodes.U) {
e.preventDefault();
if (this.props.postType === 'post' && document.activeElement.id === 'post_textbox' || this.props.postType === 'comment' && document.activeElement.id === 'reply_textbox') {
if ((this.props.postType === 'post' && document.activeElement.id === 'post_textbox') ||
(this.props.postType === 'comment' && document.activeElement.id === 'reply_textbox')) {
$(this.refs.fileInput).focus().trigger('click');
}
}
Expand Down
10 changes: 5 additions & 5 deletions webapp/components/invite_member_modal.jsx
View file
Expand Up @@ -131,7 +131,7 @@ class InviteMemberModal extends React.Component {
invites.push(invite);
}

this.setState({emailErrors: emailErrors, firstNameErrors: firstNameErrors, lastNameErrors: lastNameErrors});
this.setState({emailErrors, firstNameErrors, lastNameErrors});

if (!valid || invites.length === 0) {
return;
Expand All @@ -151,7 +151,7 @@ class InviteMemberModal extends React.Component {
(err) => {
if (err.id === 'api.team.invite_members.already.app_error') {
emailErrors[err.detailed_error] = err.message;
this.setState({emailErrors: emailErrors});
this.setState({emailErrors});
} else {
this.setState({serverError: err.message});
}
Expand Down Expand Up @@ -193,7 +193,7 @@ class InviteMemberModal extends React.Component {
var count = this.state.idCount + 1;
var inviteIds = this.state.inviteIds;
inviteIds.push(count);
this.setState({inviteIds: inviteIds, idCount: count});
this.setState({inviteIds, idCount: count});
}

clearFields() {
Expand Down Expand Up @@ -225,7 +225,7 @@ class InviteMemberModal extends React.Component {
if (!inviteIds.length) {
inviteIds.push(++count);
}
this.setState({inviteIds: inviteIds, idCount: count});
this.setState({inviteIds, idCount: count});
}

showGetTeamInviteLinkModal() {
Expand Down Expand Up @@ -435,7 +435,7 @@ class InviteMemberModal extends React.Component {
id='invite_member.teamInviteLink'
defaultMessage='You can also invite people using the {link}.'
values={{
link: (link)
link
}}
/>
</p>
Expand Down
2 changes: 1 addition & 1 deletion webapp/components/msg_typing.jsx
View file
Expand Up @@ -71,7 +71,7 @@ class MsgTyping extends React.Component {
defaultMessage='{users} and {last} are typing...'
values={{
users: (users.join(', ')),
last: (last)
last
}}
/>
);
Expand Down
2 changes: 1 addition & 1 deletion webapp/components/navbar.jsx
View file
Expand Up @@ -636,7 +636,7 @@ export default class Navbar extends React.Component {
defaultMessage='No channel header yet.{newline}{link} to add one.'
values={{
newline: (<br/>),
link: (link)
link
}}
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion webapp/components/removed_from_channel_modal.jsx
View file
Expand Up @@ -116,7 +116,7 @@ export default class RemovedFromChannelModal extends React.Component {
id='removed_channel.remover'
defaultMessage='{remover} removed you from {channel}'
values={{
remover: (remover),
remover,
channel: (channelName)
}}
/>
Expand Down
2 changes: 1 addition & 1 deletion webapp/components/rename_channel_modal.jsx
View file
Expand Up @@ -203,7 +203,7 @@ export default class RenameChannelModal extends React.Component {
const displayName = ReactDOM.findDOMNode(this.refs.displayName).value.trim();
const channelName = Utils.cleanUpUrlable(displayName);
ReactDOM.findDOMNode(this.refs.channelName).value = channelName;
this.setState({channelName: channelName});
this.setState({channelName});
}
}

Expand Down
2 changes: 1 addition & 1 deletion webapp/components/suggestion/suggestion_list.jsx
View file
Expand Up @@ -87,7 +87,7 @@ export default class SuggestionList extends React.Component {
content.scrollTop(itemTop - contentTopPadding);
} else if (itemBottom + contentTopPadding + contentBottomPadding > contentTop + visibleContentHeight) {
// the item has gone off the bottom of the visible space
content.scrollTop(itemBottom - visibleContentHeight + contentTopPadding + contentBottomPadding);
content.scrollTop((itemBottom - visibleContentHeight) + contentTopPadding + contentBottomPadding);
}
}
}
Expand Down
13 changes: 11 additions & 2 deletions webapp/components/user_settings/user_settings_general.jsx
View file
Expand Up @@ -295,8 +295,17 @@ class UserSettingsGeneralTab extends React.Component {
setupInitialState(props) {
const user = props.user;

return {username: user.username, firstName: user.first_name, lastName: user.last_name, nickname: user.nickname,
email: user.email, confirmEmail: '', picture: null, loadingPicture: false, emailChangeInProgress: false};
return {
username: user.username,
firstName: user.first_name,
lastName: user.last_name,
nickname: user.nickname,
email: user.email,
confirmEmail: '',
picture: null,
loadingPicture: false,
emailChangeInProgress: false
};
}

createEmailSection() {
Expand Down
6 changes: 3 additions & 3 deletions webapp/package.json
View file
Expand Up @@ -35,7 +35,7 @@
"velocity-animate": "1.2.3"
},
"devDependencies": {
"babel-eslint": "6.0.4",
"babel-eslint": "6.1.2",
"babel-loader": "6.2.4",
"babel-plugin-transform-runtime": "6.8.0",
"babel-polyfill": "6.8.0",
Expand All @@ -44,8 +44,8 @@
"babel-preset-stage-0": "6.5.0",
"copy-webpack-plugin": "2.1.3",
"css-loader": "0.23.1",
"eslint": "2.9.0",
"eslint-plugin-react": "5.1.1",
"eslint": "3.0.1",
"eslint-plugin-react": "5.2.2",
"exports-loader": "0.6.3",
"extract-text-webpack-plugin": "1.0.1",
"file-loader": "0.8.5",
Expand Down
4 changes: 2 additions & 2 deletions webapp/utils/channel_intro_messages.jsx
View file
Expand Up @@ -194,7 +194,7 @@ export function createStandardIntroMessage(channel, centeredIntro) {
values={{
name: (uiName),
type: (uiType),
date: (date)
date
}}
/>
);
Expand All @@ -207,7 +207,7 @@ export function createStandardIntroMessage(channel, centeredIntro) {
values={{
name: (uiName),
type: (uiType),
date: (date),
date,
creator: creatorName
}}
/>
Expand Down
8 changes: 4 additions & 4 deletions webapp/utils/utils.jsx
View file
Expand Up @@ -139,7 +139,7 @@ export function notifyMe(title, body, channel, teamId) {
Notification.requestPermission((permission) => {
if (permission === 'granted') {
try {
var notification = new Notification(title, {body: body, tag: body, icon: icon50});
var notification = new Notification(title, {body, tag: body, icon: icon50});
notification.onclick = () => {
window.focus();
if (channel) {
Expand Down Expand Up @@ -413,7 +413,7 @@ export function insertHtmlEntities(text) {
export function searchForTerm(term) {
AppDispatcher.handleServerAction({
type: ActionTypes.RECEIVED_SEARCH_TERM,
term: term,
term,
do_search: true
});
}
Expand Down Expand Up @@ -494,7 +494,7 @@ export function splitFileLocation(fileLocation) {
var filePath = fileSplit.join('.');
var filename = filePath.split('/')[filePath.split('/').length - 1];

return {ext: ext, name: filename, path: filePath};
return {ext, name: filename, path: filePath};
}

export function getPreviewImagePath(filename) {
Expand Down Expand Up @@ -1079,7 +1079,7 @@ export function generateId() {
if (c === 'x') {
v = r;
} else {
v = r & 0x3 | 0x8;
v = (r & 0x3) | 0x8;
}

return v.toString(16);
Expand Down

0 comments on commit c28f706

Please sign in to comment.