From 1470b86896add25f01d0fb07d0e9f449068120e3 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Tue, 20 Feb 2018 16:51:59 +0100
Subject: [PATCH] Fix logout

---
 mockup/user-panel.html          |  2 +-
 src/converse-profile.js         | 18 +++++++++++-------
 src/templates/profile_view.html |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/mockup/user-panel.html b/mockup/user-panel.html
index 7ecc34883..11607dfa9 100644
--- a/mockup/user-panel.html
+++ b/mockup/user-panel.html
@@ -5,7 +5,7 @@
         <span class="username w-100 align-self-center">Walter White</span>
         <!-- <a class="chatbox-btn fa fa-vcard align-self-center" title="Your profile" data-toggle="modal" data-target="#userProfileModal"></a> -->
         <!-- <a class="chatbox-btn fa fa-cog align-self-center" title="Change settings" data-toggle="modal" data-target="#settingsModal"></a> -->
-        <a class="chatbox-btn fa fa-sign-out align-self-center" title="Log out"></a>
+        <a class="chatbox-btn logout fa fa-sign-out align-self-center" title="Log out"></a>
     </div>
     <div class="d-flex xmpp-status">
         <span class="online w-100 align-self-center" data-value="online">
diff --git a/src/converse-profile.js b/src/converse-profile.js
index ebf7e9667..57a9198ad 100644
--- a/src/converse-profile.js
+++ b/src/converse-profile.js
@@ -42,7 +42,8 @@
                     "click a.choose-xmpp-status": "toggleOptions",
                     "click #fancy-xmpp-status-select a.change-xmpp-status-message": "renderStatusChangeForm",
                     "submit": "setStatusMessage",
-                    "click .dropdown dd ul li a": "setStatus"
+                    "click .dropdown dd ul li a": "setStatus",
+                    "click .logout": "logOut"
                 },
 
                 initialize () {
@@ -88,15 +89,18 @@
                     this.model.setStatusMessage(ev.target.querySelector('input').value);
                 },
 
+                logOut (ev) {
+                    ev.preventDefault();
+                    const result = confirm(__("Are you sure you want to log out?"));
+                    if (result === true) {
+                        _converse.logOut();
+                    }
+                },
+
                 setStatus (ev) {
                     ev.preventDefault();
                     const value = ev.target.getAttribute('data-value');
-                    if (value === 'logout') {
-                        _converse.logOut();
-                    } else {
-                        this.model.setStatus(value);
-                    }
-                    utils.slideIn(this.el.querySelector("#target dd ul"));
+                    this.model.setStatus(value);
                 },
 
                 getPrettyStatus (stat) {
diff --git a/src/templates/profile_view.html b/src/templates/profile_view.html
index 24f522847..fca4673e9 100644
--- a/src/templates/profile_view.html
+++ b/src/templates/profile_view.html
@@ -6,7 +6,7 @@
     <span class="username w-100 align-self-center">{{{o.fullname}}}</span>
     <!-- <a class="chatbox-btn fa fa-vcard align-self-center" title="{{{o.title_your_profile}}}" data-toggle="modal" data-target="#userProfileModal"></a> -->
     <!-- <a class="chatbox-btn fa fa-cog align-self-center" title="{{{o.title_change_status}}}" data-toggle="modal" data-target="#settingsModal"></a> -->
-    <a class="chatbox-btn fa fa-sign-out align-self-center" title="{{{o.title_log_out}}}"></a>
+    <a class="chatbox-btn logout fa fa-sign-out align-self-center" title="{{{o.title_log_out}}}"></a>
 </div>
 <div class="d-flex xmpp-status">
     <span class="{{{o.chat_status}}} w-100 align-self-center" data-value="{{{o.chat_status}}}">