From 7d74319efd48e6fc807e23e2087e29440f2722b0 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Thu, 3 Jan 2019 11:45:52 +0100
Subject: [PATCH] Fixes #1356

---
 CHANGES.md                 | 2 ++
 dist/converse.js           | 6 +++---
 src/converse-bookmarks.js  | 2 +-
 src/converse-roomslist.js  | 2 +-
 src/converse-rosterview.js | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index d6d880bdc..e7d86e722 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,12 +8,14 @@
 - Add a new `converse-pubsub` plugin, for generic PubSub operations
 - #1180 It's now possible to use OMEMO in a MUC (if it's members-only and non-anonymous)
 - #1353 Message Delivery Receipts not working because of the message "type" attribute
+- #1356 Make triangle icon usable 
 - #1374 Can't load embedded chat when changing `view_mode` between page reloads
 - #1376 Fixed some alignment issues in the sidebar
 - #1378 Message Delivery Receipts were being sent for carbons and own messages
 - #1379 MUC unread messages indicator is failing
 - #1382 Message Delivery Receipts: Set store hint and type='chat'
 
+
 ## 4.0.6 (2018-12-07)
 
 - Updated translations: ar, cs, de, es, eu, fr, gl, hu, id, it, ja, nb, pt_BR
diff --git a/dist/converse.js b/dist/converse.js
index 47497ddf3..470e8c885 100644
--- a/dist/converse.js
+++ b/dist/converse.js
@@ -48985,7 +48985,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins
           ev.preventDefault();
         }
 
-        const icon_el = ev.target.querySelector('.fa');
+        const icon_el = ev.target.matches('.fa') ? ev.target : ev.target.querySelector('.fa');
 
         if (u.hasClass('fa-caret-down', icon_el)) {
           u.slideIn(this.el.querySelector('.bookmarks'));
@@ -58913,7 +58913,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins
           ev.preventDefault();
         }
 
-        const icon_el = ev.target.querySelector('.fa');
+        const icon_el = ev.target.matches('.fa') ? ev.target : ev.target.querySelector('.fa');
 
         if (icon_el.classList.contains("fa-caret-down")) {
           u.slideIn(this.el.querySelector('.open-rooms-list')).then(() => {
@@ -59748,7 +59748,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_5__["default"].plugins
           ev.preventDefault();
         }
 
-        const icon_el = ev.target.querySelector('.fa');
+        const icon_el = ev.target.matches('.fa') ? ev.target : ev.target.querySelector('.fa');
 
         if (_.includes(icon_el.classList, "fa-caret-down")) {
           this.model.save({
diff --git a/src/converse-bookmarks.js b/src/converse-bookmarks.js
index 3d7da566d..b3f6859fa 100644
--- a/src/converse-bookmarks.js
+++ b/src/converse-bookmarks.js
@@ -507,7 +507,7 @@ converse.plugins.add('converse-bookmarks', {
 
             toggleBookmarksList (ev) {
                 if (ev && ev.preventDefault) { ev.preventDefault(); }
-                const icon_el = ev.target.querySelector('.fa');
+                const icon_el = ev.target.matches('.fa') ? ev.target : ev.target.querySelector('.fa');
                 if (u.hasClass('fa-caret-down', icon_el)) {
                     u.slideIn(this.el.querySelector('.bookmarks'));
                     this.list_model.save({'toggle-state': _converse.CLOSED});
diff --git a/src/converse-roomslist.js b/src/converse-roomslist.js
index c6a079381..cad37c8e8 100644
--- a/src/converse-roomslist.js
+++ b/src/converse-roomslist.js
@@ -245,7 +245,7 @@ converse.plugins.add('converse-roomslist', {
 
             toggleRoomsList (ev) {
                 if (ev && ev.preventDefault) { ev.preventDefault(); }
-                const icon_el = ev.target.querySelector('.fa');
+                const icon_el = ev.target.matches('.fa') ? ev.target : ev.target.querySelector('.fa');
                 if (icon_el.classList.contains("fa-caret-down")) {
                     u.slideIn(this.el.querySelector('.open-rooms-list')).then(() => {
                         this.list_model.save({'toggle-state': _converse.CLOSED});
diff --git a/src/converse-rosterview.js b/src/converse-rosterview.js
index 52d8ce26a..624812006 100644
--- a/src/converse-rosterview.js
+++ b/src/converse-rosterview.js
@@ -688,7 +688,7 @@ converse.plugins.add('converse-rosterview', {
 
             async toggle (ev) {
                 if (ev && ev.preventDefault) { ev.preventDefault(); }
-                const icon_el = ev.target.querySelector('.fa');
+                const icon_el = ev.target.matches('.fa') ? ev.target : ev.target.querySelector('.fa');
                 if (_.includes(icon_el.classList, "fa-caret-down")) {
                     this.model.save({state: _converse.CLOSED});
                     await this.collapse();