Fix some more Javascript linting issues and discrepancies with upstream (#2209)

* Fix typo in flavours/glitch/features/video/index.js

* Fix various linting issues and discrepancies with upstream

app/javascript/flavours/glitch/features/compose/components/compose_form.jsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import CharacterCounter from './character_counter';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import ReplyIndicatorContainer from '../containers/reply_indicator_container';
@@ -11,13 +12,12 @@ import UploadFormContainer from '../containers/upload_form_container';
 import WarningContainer from '../containers/warning_container';
 import { isMobile } from 'flavours/glitch/is_mobile';
 import ImmutablePureComponent from 'react-immutable-pure-component';
+import { length } from 'stringz';
 import { countableText } from '../util/counter';
+import { maxChars } from 'flavours/glitch/initial_state';
 import OptionsContainer from '../containers/options_container';
 import Publisher from './publisher';
 import TextareaIcons from './textarea_icons';
-import { maxChars } from 'flavours/glitch/initial_state';
-import CharacterCounter from './character_counter';
-import { length } from 'stringz';
 
 const messages = defineMessages({
   placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' },
@@ -76,7 +76,6 @@ class ComposeForm extends ImmutablePureComponent {
     preselectOnReply: PropTypes.bool,
     onChangeSpoilerness: PropTypes.func,
     onChangeVisibility: PropTypes.func,
-    onPaste: PropTypes.func,
     onMediaDescriptionConfirm: PropTypes.func,
   };
 
@@ -164,11 +163,11 @@ class ComposeForm extends ImmutablePureComponent {
   };
 
   //  Selects a suggestion from the autofill.
-  onSuggestionSelected = (tokenStart, token, value) => {
+  handleSuggestionSelected = (tokenStart, token, value) => {
     this.props.onSuggestionSelected(tokenStart, token, value, ['text']);
   };
 
-  onSpoilerSuggestionSelected = (tokenStart, token, value) => {
+  handleSpoilerSuggestionSelected = (tokenStart, token, value) => {
     this.props.onSuggestionSelected(tokenStart, token, value, ['spoiler_text']);
   };
 
@@ -177,7 +176,7 @@ class ComposeForm extends ImmutablePureComponent {
       this.handleSubmit();
     }
 
-    if (e.keyCode == 13 && e.altKey) {
+    if (e.keyCode === 13 && e.altKey) {
       this.handleSecondarySubmit();
     }
   };
@@ -281,9 +280,7 @@ class ComposeForm extends ImmutablePureComponent {
     const {
       handleEmojiPick,
       handleSecondarySubmit,
-      handleSelect,
       handleSubmit,
-      handleRefTextarea,
     } = this;
     const {
       advancedOptions,
@@ -291,7 +288,6 @@ class ComposeForm extends ImmutablePureComponent {
       isSubmitting,
       layout,
       onChangeSpoilerness,
-      onChangeVisibility,
       onClearSuggestions,
       onFetchSuggestions,
       onPaste,
@@ -322,10 +318,10 @@ class ComposeForm extends ImmutablePureComponent {
             onKeyDown={this.handleKeyDown}
             disabled={!spoiler}
             ref={this.handleRefSpoilerText}
-            suggestions={this.props.suggestions}
+            suggestions={suggestions}
             onSuggestionsFetchRequested={onFetchSuggestions}
             onSuggestionsClearRequested={onClearSuggestions}
-            onSuggestionSelected={this.onSpoilerSuggestionSelected}
+            onSuggestionSelected={this.handleSpoilerSuggestionSelected}
             searchTokens={[':']}
             id='glitch.composer.spoiler.input'
             className='spoiler-input__input'
@@ -342,11 +338,11 @@ class ComposeForm extends ImmutablePureComponent {
           value={this.props.text}
           onChange={this.handleChange}
           onKeyDown={this.handleKeyDown}
-          suggestions={this.props.suggestions}
+          suggestions={suggestions}
           onFocus={this.handleFocus}
           onSuggestionsFetchRequested={onFetchSuggestions}
           onSuggestionsClearRequested={onClearSuggestions}
-          onSuggestionSelected={this.onSuggestionSelected}
+          onSuggestionSelected={this.handleSuggestionSelected}
           onPaste={onPaste}
           autoFocus={!showSearch && !isMobile(window.innerWidth, layout)}
           lang={this.props.lang}

app/javascript/flavours/glitch/features/compose/components/dropdown.jsx

@@ -8,9 +8,6 @@ import Overlay from 'react-overlays/Overlay';
 import IconButton from 'flavours/glitch/components/icon_button';
 import DropdownMenu from './dropdown_menu';
 
-//  Utils.
-import { assignHandlers } from 'flavours/glitch/utils/react_helpers';
-
 //  The component.
 export default class ComposerOptionsDropdown extends React.PureComponent {
 
@@ -50,7 +47,7 @@ export default class ComposerOptionsDropdown extends React.PureComponent {
     const { open } = this.state;
 
     if (this.props.isUserTouching && this.props.isUserTouching()) {
-      if (this.state.open) {
+      if (open) {
         this.props.onModalClose();
       } else {
         const modal = this.handleMakeModal();
@@ -59,10 +56,10 @@ export default class ComposerOptionsDropdown extends React.PureComponent {
         }
       }
     } else {
-      if (this.state.open && this.activeElement) {
+      if (open && this.activeElement) {
         this.activeElement.focus({ preventScroll: true });
       }
-      this.setState({ open: !this.state.open, openedViaKeyboard: type !== 'click' });
+      this.setState({ open: !open, openedViaKeyboard: type !== 'click' });
     }
   };
 

app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx

@@ -1,7 +1,6 @@
 //  Package imports.
 import PropTypes from 'prop-types';
 import React from 'react';
-import ImmutablePureComponent from 'react-immutable-pure-component';
 import classNames from 'classnames';
 
 //  Components.
@@ -9,7 +8,6 @@ import Icon from 'flavours/glitch/components/icon';
 
 //  Utils.
 import { withPassive } from 'flavours/glitch/utils/dom_helpers';
-import { assignHandlers } from 'flavours/glitch/utils/react_helpers';
 
 //  The component.
 export default class ComposerOptionsDropdownContent extends React.PureComponent {
@@ -78,7 +76,8 @@ export default class ComposerOptionsDropdownContent extends React.PureComponent
       items,
     } = this.props;
 
-    const { name } = this.props.items[i];
+    const { name } = items[i];
+
     e.preventDefault();  //  Prevents change in focus on click
     if (closeOnChange) {
       onClose();
@@ -131,7 +130,7 @@ export default class ComposerOptionsDropdownContent extends React.PureComponent
 
     if (element) {
       element.focus();
-      this.handleChange(this.props.items[Number(element.getAttribute('data-index'))].name);
+      this.handleChange(items[Number(element.getAttribute('data-index'))].name);
       e.preventDefault();
       e.stopPropagation();
     }
@@ -169,6 +168,7 @@ export default class ComposerOptionsDropdownContent extends React.PureComponent
         onClick={this.handleClick}
         onKeyDown={this.handleKeyDown}
         role='option'
+        aria-selected={active}
         tabIndex={0}
         key={name}
         data-index={i}
@@ -183,8 +183,6 @@ export default class ComposerOptionsDropdownContent extends React.PureComponent
   render () {
     const {
       items,
-      onChange,
-      onClose,
       style,
     } = this.props;
 

app/javascript/flavours/glitch/features/compose/components/poll_form.jsx

@@ -145,6 +145,7 @@ class PollForm extends ImmutablePureComponent {
         </ul>
 
         <div className='poll__footer'>
+          {/* eslint-disable-next-line jsx-a11y/no-onchange */}
           <select value={isMultiple ? 'true' : 'false'} onChange={this.handleSelectMultiple}>
             <option value='false'>{intl.formatMessage(messages.single_choice)}</option>
             <option value='true'>{intl.formatMessage(messages.multiple_choices)}</option>

app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx

@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import ImmutablePropTypes from 'react-immutable-proptypes';
 import { defineMessages, injectIntl } from 'react-intl';
 import Dropdown from './dropdown';
 

app/javascript/flavours/glitch/features/compose/components/search.jsx

@@ -1,8 +1,6 @@
 //  Package imports.
-import classNames from 'classnames';
-import PropTypes from 'prop-types';
 import React from 'react';
-import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
 import {
   injectIntl,
   FormattedMessage,

app/javascript/flavours/glitch/features/compose/components/upload.jsx

@@ -6,7 +6,6 @@ import spring from 'react-motion/lib/spring';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { FormattedMessage } from 'react-intl';
 import Icon from 'flavours/glitch/components/icon';
-import { isUserTouching } from 'flavours/glitch/is_mobile';
 
 export default class Upload extends ImmutablePureComponent {
 

app/javascript/flavours/glitch/features/compose/index.jsx

@@ -2,7 +2,6 @@ import React from 'react';
 import ComposeFormContainer from './containers/compose_form_container';
 import NavigationContainer from './containers/navigation_container';
 import PropTypes from 'prop-types';
-import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 import { mountCompose, unmountCompose, cycleElefriendCompose } from 'flavours/glitch/actions/compose';
 import { injectIntl, defineMessages } from 'react-intl';
@@ -11,7 +10,7 @@ import SearchContainer from './containers/search_container';
 import Motion from '../ui/util/optional_motion';
 import spring from 'react-motion/lib/spring';
 import SearchResultsContainer from './containers/search_results_container';
-import { me, mascot } from 'flavours/glitch/initial_state';
+import { mascot } from 'flavours/glitch/initial_state';
 import HeaderContainer from './containers/header_container';
 import Column from 'flavours/glitch/components/column';
 import { Helmet } from 'react-helmet';
@@ -25,7 +24,7 @@ const mapStateToProps = (state, ownProps) => ({
   showSearch: ownProps.multiColumn ? state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']) : false,
 });
 
-const mapDispatchToProps = (dispatch, { intl }) => ({
+const mapDispatchToProps = (dispatch) => ({
   onClickElefriend () {
     dispatch(cycleElefriendCompose());
   },