From d85ac97dc60f45c1a21c8e94b4dec2724ce52547 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 2 Nov 2017 17:11:25 +0100
Subject: [PATCH] FIX: clicking on button label didn't close popup

---
 .../javascripts/discourse/components/popup-menu.js.es6     | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/popup-menu.js.es6 b/app/assets/javascripts/discourse/components/popup-menu.js.es6
index 4f8de9b5924..64ef71752dd 100644
--- a/app/assets/javascripts/discourse/components/popup-menu.js.es6
+++ b/app/assets/javascripts/discourse/components/popup-menu.js.es6
@@ -11,11 +11,8 @@ export default Ember.Component.extend({
       this.sendAction('hide');
     });
 
-    $('html').on(`mouseup.popup-menu-${this.get('elementId')}`, (e) => {
-      const $target = $(e.target);
-      if ($target.is("button") || this.$().has($target).length === 0) {
-        this.sendAction('hide');
-      }
+    $('html').on(`mouseup.popup-menu-${this.get('elementId')}`, () => {
+      this.sendAction('hide');
     });
   },