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/notifications/components/admin_report.jsx

@@ -2,22 +2,17 @@
 import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
-import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { HotKeys } from 'react-hotkeys';
 import classNames from 'classnames';
 
 // Our imports.
 import Permalink from 'flavours/glitch/components/permalink';
-import AccountContainer from 'flavours/glitch/containers/account_container';
 import NotificationOverlayContainer from '../containers/overlay_container';
 import Icon from 'flavours/glitch/components/icon';
 import Report from './report';
 
-const messages = defineMessages({
-  adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
-});
-
 export default class AdminReport extends ImmutablePureComponent {
 
   static propTypes = {
@@ -67,7 +62,7 @@ export default class AdminReport extends ImmutablePureComponent {
   }
 
   render () {
-    const { intl, account, notification, unread, report } = this.props;
+    const { account, notification, unread, report } = this.props;
 
     if (!report) {
       return null;

app/javascript/flavours/glitch/features/notifications/containers/follow_request_container.js

@@ -1,5 +1,4 @@
 import { connect } from 'react-redux';
-import { makeGetAccount } from 'flavours/glitch/selectors';
 import FollowRequest from '../components/follow_request';
 import { authorizeFollowRequest, rejectFollowRequest } from 'flavours/glitch/actions/accounts';
 

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

@@ -9,9 +9,9 @@ import {
   enterNotificationClearingMode,
   expandNotifications,
   scrollTopNotifications,
+  loadPending,
   mountNotifications,
   unmountNotifications,
-  loadPending,
   markNotificationsAsRead,
 } from 'flavours/glitch/actions/notifications';
 import { addColumn, removeColumn, moveColumn } from 'flavours/glitch/actions/columns';
@@ -79,16 +79,6 @@ const mapDispatchToProps = dispatch => ({
   onEnterCleaningMode(yes) {
     dispatch(enterNotificationClearingMode(yes));
   },
-  onMarkAsRead() {
-    dispatch(markNotificationsAsRead());
-    dispatch(submitMarkers({ immediate: true }));
-  },
-  onMount() {
-    dispatch(mountNotifications());
-  },
-  onUnmount() {
-    dispatch(unmountNotifications());
-  },
   dispatch,
 });
 
@@ -112,8 +102,6 @@ class Notifications extends React.PureComponent {
     localSettings: ImmutablePropTypes.map,
     notifCleaningActive: PropTypes.bool,
     onEnterCleaningMode: PropTypes.func,
-    onMount: PropTypes.func,
-    onUnmount: PropTypes.func,
     lastReadId: PropTypes.string,
     canMarkAsRead: PropTypes.bool,
     needsNotificationPermission: PropTypes.bool,
@@ -127,6 +115,18 @@ class Notifications extends React.PureComponent {
     animatingNCD: false,
   };
 
+  componentDidMount() {
+    this.props.dispatch(mountNotifications());
+  }
+
+  componentWillUnmount () {
+    this.handleLoadOlder.cancel();
+    this.handleScrollToTop.cancel();
+    this.handleScroll.cancel();
+    // this.props.dispatch(scrollTopNotifications(false));
+    this.props.dispatch(unmountNotifications());
+  }
+
   handleLoadGap = (maxId) => {
     this.props.dispatch(expandNotifications({ maxId }));
   };
@@ -195,20 +195,6 @@ class Notifications extends React.PureComponent {
     }
   }
 
-  componentDidMount () {
-    const { onMount } = this.props;
-    if (onMount) {
-      onMount();
-    }
-  }
-
-  componentWillUnmount () {
-    const { onUnmount } = this.props;
-    if (onUnmount) {
-      onUnmount();
-    }
-  }
-
   handleTransitionEndNCD = () => {
     this.setState({ animatingNCD: false });
   };
@@ -219,12 +205,13 @@ class Notifications extends React.PureComponent {
   };
 
   handleMarkAsRead = () => {
-    this.props.onMarkAsRead();
+    this.props.dispatch(markNotificationsAsRead());
+    this.props.dispatch(submitMarkers({ immediate: true }));
   };
 
   render () {
     const { intl, notifications, isLoading, isUnread, columnId, multiColumn, hasMore, numPending, showFilterBar, lastReadId, canMarkAsRead, needsNotificationPermission } = this.props;
-    const { notifCleaning, notifCleaningActive } = this.props;
+    const { notifCleaningActive } = this.props;
     const { animatingNCD } = this.state;
     const pinned = !!columnId;
     const emptyMessage = <FormattedMessage id='empty_column.notifications' defaultMessage="You don't have any notifications yet. When other people interact with you, you will see it here." />;