Fix rebase changes

src/newsreader/js/components/Messages.js

@@ -3,9 +3,7 @@ import React from 'react';
 class Messages extends React.Component {
   state = { messages: this.props.messages };
 
-  close = ::this.close;
+  close = (index) => {
-
-  close(index) {
     const newMessages = this.state.messages.filter((message, currentIndex) => {
       return currentIndex != index;
     });

src/newsreader/js/pages/homepage/components/PostModal.js

@@ -7,132 +7,131 @@ import { SAVED_TYPE } from '../constants.js';
 import { formatDatetime } from '../../../utils.js';
 
 class PostModal extends React.Component {
-  modalListener = ::this.modalListener;
+  readTimer = null;
-readTimer = null;
 
-componentDidMount() {
+  componentDidMount() {
-  const post = { ...this.props.post };
+    const post = { ...this.props.post };
-  const markPostRead = this.props.markPostRead;
+    const markPostRead = this.props.markPostRead;
-  const token = Cookies.get('csrftoken');
+    const token = Cookies.get('csrftoken');
 
-  if (this.props.autoMarking && this.props.selectedType != SAVED_TYPE && !post.read) {
+    if (this.props.autoMarking && this.props.selectedType != SAVED_TYPE && !post.read) {
-    this.readTimer = setTimeout(markPostRead, 3000, post, token);
+      this.readTimer = setTimeout(markPostRead, 3000, post, token);
+    }
+
+    window.addEventListener('click', this.modalListener);
   }
 
-  window.addEventListener('click', this.modalListener);
+  componentWillUnmount() {
-}
+    if (this.readTimer) {
+      clearTimeout(this.readTimer);
+    }
 
-componentWillUnmount() {
+    this.readTimer = null;
-  if (this.readTimer) {
+
-    clearTimeout(this.readTimer);
+    window.removeEventListener('click', this.modalListener);
   }
 
-  this.readTimer = null;
+  modalListener = (e) => {
+    const targetClassName = e.target.className;
 
-  window.removeEventListener('click', this.modalListener);
+    if (this.props.post && targetClassName == 'modal post-modal') {
-}
+      this.props.unSelectPost();
-
+    }
-modalListener(e) {
-  const targetClassName = e.target.className;
-
-  if (this.props.post && targetClassName == 'modal post-modal') {
-    this.props.unSelectPost();
-  }
-}
-
-render() {
-  const post = this.props.post;
-  const token = Cookies.get('csrftoken');
-  const publicationDate = formatDatetime(post.publicationDate);
-  const titleClassName = post.read ? 'post__title post__title--read' : 'post__title';
-  const readButtonDisabled =
-    post.read || this.props.isUpdating || this.props.selectedType === SAVED_TYPE;
-  const savedIconClass = post.saved
-    ? 'post__save post__save--saved saved-icon saved-icon--saved'
-    : 'post__save saved-icon';
-
-  let ruleUrl = '';
-
-  switch (this.props.rule.type) {
-    default:
-      ruleUrl = `${this.props.feedUrl}/${this.props.rule.id}/`;
-      break;
   }
 
-  return (
+  render() {
-    <div className="modal post-modal">
+    const post = this.props.post;
-      <div className="post">
+    const token = Cookies.get('csrftoken');
-        <div className="post__container">
+    const publicationDate = formatDatetime(post.publicationDate);
-          <div className="post__header">
+    const titleClassName = post.read ? 'post__title post__title--read' : 'post__title';
-            <div className="post__actions">
+    const readButtonDisabled =
-              <button
+      post.read || this.props.isUpdating || this.props.selectedType === SAVED_TYPE;
-                className={`button read-button ${readButtonDisabled &&
+    const savedIconClass = post.saved
-                  'button--disabled'}`}
+      ? 'post__save post__save--saved saved-icon saved-icon--saved'
-                onClick={() =>
+      : 'post__save saved-icon';
-                  !readButtonDisabled && this.props.markPostRead(post, token)
-                }
-              >
-                <i className="fas fa-check" /> Mark as read
-              </button>
-              <button
-                className="button post__close-button"
-                onClick={() => this.props.unSelectPost()}
-              >
-                <i className="fas fa-times"></i> Close
-              </button>
-            </div>
-            <div className="post__heading">
-              <h2 className={titleClassName}>{`${post.title} `}</h2>
-              <div className="post__meta">
-                <div className="post__text">
-                  <span className="post__date">{publicationDate}</span>
-                  {post.author && <span className="post__author">{post.author}</span>}
-                </div>
 
-                <div className="post__buttons">
+    let ruleUrl = '';
-                  {this.props.category && (
+
-                    <span
+    switch (this.props.rule.type) {
-                      className="badge post__category"
+      default:
-                      title={this.props.category.name}
+        ruleUrl = `${this.props.feedUrl}/${this.props.rule.id}/`;
-                    >
+        break;
-                      <a
+    }
-                        href={`${this.props.categoriesUrl}/${this.props.category.id}/`}
+
-                        target="_blank"
+    return (
-                        rel="noopener noreferrer"
+      <div className="modal post-modal">
+        <div className="post">
+          <div className="post__container">
+            <div className="post__header">
+              <div className="post__actions">
+                <button
+                  className={`button read-button ${readButtonDisabled &&
+'button--disabled'}`}
+                  onClick={() =>
+                    !readButtonDisabled && this.props.markPostRead(post, token)
+                  }
+                >
+                  <i className="fas fa-check" /> Mark as read
+                </button>
+                <button
+                  className="button post__close-button"
+                  onClick={() => this.props.unSelectPost()}
+                >
+                  <i className="fas fa-times"></i> Close
+                </button>
+              </div>
+              <div className="post__heading">
+                <h2 className={titleClassName}>{`${post.title} `}</h2>
+                <div className="post__meta">
+                  <div className="post__text">
+                    <span className="post__date">{publicationDate}</span>
+                    {post.author && <span className="post__author">{post.author}</span>}
+                  </div>
+
+                  <div className="post__buttons">
+                    {this.props.category && (
+                      <span
+                        className="badge post__category"
+                        title={this.props.category.name}
                       >
-                        {this.props.category.name}
+                        <a
+                          href={`${this.props.categoriesUrl}/${this.props.category.id}/`}
+                          target="_blank"
+                          rel="noopener noreferrer"
+                        >
+                          {this.props.category.name}
+                        </a>
+                      </span>
+                    )}
+                    <span className="badge post__rule" title={this.props.rule.name}>
+                      <a href={ruleUrl} target="_blank" rel="noopener noreferrer">
+                        {this.props.rule.name}
                       </a>
                     </span>
-                  )}
+                    <a
-                  <span className="badge post__rule" title={this.props.rule.name}>
+                      className="post__link"
-                    <a href={ruleUrl} target="_blank" rel="noopener noreferrer">
+                      href={post.url}
-                      {this.props.rule.name}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                    >
+                      <i className="fas fa-external-link-alt" />
                     </a>
-                  </span>
+                    <span
-                  <a
+                      className={savedIconClass}
-                    className="post__link"
+                      onClick={() => this.props.toggleSaved(post, token)}
-                    href={post.url}
+                    />
-                    target="_blank"
+                  </div>
-                    rel="noopener noreferrer"
-                  >
-                    <i className="fas fa-external-link-alt" />
-                  </a>
-                  <span
-                    className={savedIconClass}
-                    onClick={() => this.props.toggleSaved(post, token)}
-                  />
                 </div>
               </div>
             </div>
           </div>
-        </div>
 
-        {/* HTML is sanitized by the collectors */}
+          {/* HTML is sanitized by the collectors */}
-        <div className="post__body" dangerouslySetInnerHTML={{ __html: post.body }} />
+          <div className="post__body" dangerouslySetInnerHTML={{ __html: post.body }} />
+        </div>
       </div>
-    </div>
+    );
-  );
+  }
-}
 }
 
 const mapDispatchToProps = dispatch => ({