Merge branch 'master' into config-embed

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2016 Mozilla Foundation
+Copyright 2017 Mozilla Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.md

@@ -1,6 +1,6 @@
 # Talk [![CircleCI](https://circleci.com/gh/coralproject/talk.svg?style=svg)](https://circleci.com/gh/coralproject/talk)
 
-Talk is currently in Beta! [Read more about Talk here.](https://coralproject.net/products/talk.html)
+Online comments are broken. Our open-source Talk tool rethinks how moderation, comment display, and conversation function, creating the opportunity for safer, smarter discussions around your work. [Read more about Talk here.](https://coralproject.net/products/talk.html)
 
 Third party licenses are available via the `/client/3rdpartylicenses.txt`
 endpoint when the server is running with built assets.

client/coral-plugin-flags/FlagButton.js

@@ -15,8 +15,7 @@ class FlagButton extends Component {
     message: '',
     step: 0,
     posted: false,
-    localPost: null,
-    localDelete: false
+    localPost: null
   }
 
   componentDidUpdate () {
@@ -27,17 +26,12 @@ class FlagButton extends Component {
 
   // When the "report" button is clicked expand the menu
   onReportClick = () => {
-    const {currentUser, deleteAction, flaggedByCurrentUser, flag} = this.props;
-    const {localPost, localDelete} = this.state;
-    const localFlagged = (flaggedByCurrentUser && !localDelete) || localPost;
+    const {currentUser} = this.props;
     if (!currentUser) {
       this.props.showSignInDialog();
       return;
     }
-    if (localFlagged) {
-      this.setState((prev) => prev.localPost ? {...prev, localPost: null, step: 0} : {...prev, localDelete: true});
-      deleteAction(localPost || flag.current_user.id);
-    } else if (this.state.showMenu){
+    if (this.state.showMenu) {
       this.closeMenu();
     } else {
       this.setState({showMenu: true});
@@ -136,14 +130,14 @@ class FlagButton extends Component {
 
   render () {
     const {getPopupMenu, flaggedByCurrentUser} = this.props;
-    const {localPost, localDelete} = this.state;
-    const flagged = (flaggedByCurrentUser && !localDelete) || localPost;
+    const {localPost} = this.state;
+    const flagged = flaggedByCurrentUser || localPost;
     const popupMenu = getPopupMenu[this.state.step](this.state.itemType);
 
     return <div className={`${name}-container`}>
       <button
         ref={ref => this.flagButton = ref}
-        onClick={!this.props.banned ? this.onReportClick : null}
+        onClick={!this.props.banned && !flaggedByCurrentUser && !localPost ? this.onReportClick : null}
         className={`${name}-button`}>
         {
           flagged