From 1e27cb18ebbf73c3f991ccdcd64f23d7b14730bd Mon Sep 17 00:00:00 2001
From: Yashashvi Dave <yashashvidave@gmail.com>
Date: Wed, 15 Aug 2018 23:04:38 +0530
Subject: [PATCH] user profile popover: Hide popover when user clicks on
 edit-profile-btn.

---
 frontend_tests/node_tests/popovers.js | 1 +
 static/js/popovers.js                 | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/frontend_tests/node_tests/popovers.js b/frontend_tests/node_tests/popovers.js
index 045d888fe6..161050e759 100644
--- a/frontend_tests/node_tests/popovers.js
+++ b/frontend_tests/node_tests/popovers.js
@@ -11,6 +11,7 @@ var noop =  function () {};
 $.fn.popover = noop; // this will get wrapped by our code
 
 zrequire('popovers');
+popovers.hide_user_profile = noop;
 
 set_global('current_msg_list', {});
 set_global('page_params', {
diff --git a/static/js/popovers.js b/static/js/popovers.js
index 2686860e86..a38dfe43a8 100644
--- a/static/js/popovers.js
+++ b/static/js/popovers.js
@@ -173,6 +173,10 @@ function show_user_info_popover(element, user, message) {
     }
 }
 
+exports.hide_user_profile = function () {
+    $("#user-profile-modal").modal("hide");
+};
+
 function show_user_profile(element, user) {
     popovers.hide_all();
 
@@ -676,6 +680,10 @@ exports.register_click_handlers = function () {
         e.preventDefault();
     });
 
+    $('body').on('click', '#user-profile-modal-body .user-profile-modal-edit-button', function () {
+        exports.hide_user_profile();
+    });
+
     $('#user_presences').on('click', 'span.arrow', function (e) {
         e.stopPropagation();
 
@@ -944,6 +952,7 @@ exports.hide_all = function () {
     popovers.hide_user_sidebar_popover();
     popovers.hide_userlist_sidebar();
     stream_popover.restore_stream_list_size();
+    popovers.hide_user_profile();
 
     // look through all the popovers that have been added and removed.
     list_of_popovers.forEach(function ($o) {