From c7b146cbdfda41494c350a58982d2fe54893d2c1 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 25 Jul 2019 11:14:23 +0200
Subject: [PATCH] FIX: reverts #18e2816 (#7940)

---
 app/assets/javascripts/discourse/controllers/topic.js.es6  | 5 -----
 .../templates/components/topic-footer-buttons.hbs          | 1 -
 app/assets/javascripts/discourse/templates/topic.hbs       | 4 ----
 .../javascripts/discourse/widgets/topic-admin-menu.js.es6  | 1 -
 test/javascripts/acceptance/topic-test.js.es6              | 7 -------
 5 files changed, 18 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index d4ef29adc9d..c1983bc4c16 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -722,11 +722,6 @@ export default Ember.Controller.extend(bufferedProperty("model"), {
       this._jumpToPostId(postId);
     },
 
-    hideMultiSelect() {
-      this.set("multiSelect", false);
-      this._forceRefreshPostStream();
-    },
-
     toggleMultiSelect() {
       this.toggleProperty("multiSelect");
       this._forceRefreshPostStream();
diff --git a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
index 15fbecda6df..6347270fd24 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
@@ -4,7 +4,6 @@
       topic=topic
       openUpwards="true"
       toggleMultiSelect=toggleMultiSelect
-      hideMultiSelect=hideMultiSelect
       deleteTopic=deleteTopic
       recoverTopic=recoverTopic
       toggleClosed=toggleClosed
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index afbfb72cbff..f8e5ee39034 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -95,7 +95,6 @@
                 topic=model
                 fixed="true"
                 toggleMultiSelect=(action "toggleMultiSelect")
-                hideMultiSelect=(action "hideMultiSelect")
                 deleteTopic=(action "deleteTopic")
                 recoverTopic=(action "recoverTopic")
                 toggleClosed=(action "toggleClosed")
@@ -123,7 +122,6 @@
               jumpToIndex=(action "jumpToIndex")
               replyToPost=(action "replyToPost")
               toggleMultiSelect=(action "toggleMultiSelect")
-              hideMultiSelect=(action "hideMultiSelect")
               deleteTopic=(action "deleteTopic")
               recoverTopic=(action "recoverTopic")
               toggleClosed=(action "toggleClosed")
@@ -147,7 +145,6 @@
                   openUpwards="true"
                   rightSide="true"
                   toggleMultiSelect=(action "toggleMultiSelect")
-                  hideMultiSelect=(action "hideMultiSelect")
                   deleteTopic=(action "deleteTopic")
                   recoverTopic=(action "recoverTopic")
                   toggleClosed=(action "toggleClosed")
@@ -294,7 +291,6 @@
                     {{topic-footer-buttons
                       topic=model
                       toggleMultiSelect=(action "toggleMultiSelect")
-                      hideMultiSelect=(action "hideMultiSelect")
                       deleteTopic=(action "deleteTopic")
                       recoverTopic=(action "recoverTopic")
                       toggleClosed=(action "toggleClosed")
diff --git a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
index 466cd7a575a..ccc5a82e959 100644
--- a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
@@ -90,7 +90,6 @@ createWidget("topic-admin-menu-button", {
       position.left += $button.width() - 203;
     }
     this.state.position = position;
-    this.sendWidgetAction("hideMultiSelect");
   }
 });
 
diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js.es6
index 3a3b6de1fa6..d856cc9eb1f 100644
--- a/test/javascripts/acceptance/topic-test.js.es6
+++ b/test/javascripts/acceptance/topic-test.js.es6
@@ -255,13 +255,6 @@ QUnit.test("selecting posts", async assert => {
     exists(".select-all"),
     "it should allow users to select all the posts"
   );
-
-  await click(".toggle-admin-menu");
-
-  assert.ok(
-    exists(".selected-posts.hidden"),
-    "it should hide the multi select menu"
-  );
 });
 
 QUnit.test("select below", async assert => {