From af3159f970c503c432739ac81620004bfaca406c Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Fri, 1 Jun 2018 18:18:37 +0200
Subject: Optimized chat back button actions

---
 main/app/sprinkles/core/assets/SiteAssets/js/chat.js   | 18 ++++++++++++++++--
 main/app/sprinkles/core/assets/SiteAssets/js/main.js   |  2 +-
 .../app/sprinkles/core/templates/pages/index.html.twig |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'main/app/sprinkles')

diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/chat.js b/main/app/sprinkles/core/assets/SiteAssets/js/chat.js
index 76565cf..016332b 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/js/chat.js
+++ b/main/app/sprinkles/core/assets/SiteAssets/js/chat.js
@@ -137,7 +137,12 @@ function InitializeChatServer() {
                         SelectReceiver.hide();
                         ChatMessages.hide();
                         $(".SelectedReceiver > *").addClass("animated slideInRight");
-                        $(".ChatTab .headerWrap .header .HeaderCaption").text(ReceiversUsername);
+                        $(".ChatTab .headerWrap .header .HeaderCaption.TabCaption").hide();
+                        if ($(".HeaderCaption#" + ReceiversUsername).length) {
+                            $(".HeaderCaption#" + ReceiversUsername).show();
+                        } else {
+                            $(".ChatTab .headerWrap .header > .LeftButtonHeader").after("<span id='" + ReceiversUsername + "' class='HeaderCaption'>" + ReceiversUsername + "</span>");
+                        }
                         $(".ChatTab .headerWrap .LeftButtonHeader").html("<i id='BackToChatSelectorButton' class='fas fa-caret-left'></i>"); // REPLACE MENU BUTTON WITH BACK BUTTON
                         SelectedReceiver.prepend("<div id='ChatMessages' class='ChatMessages' data-username='" + ReceiversUsername + "'></div>");
                         SelectedReceiver.show();
@@ -317,13 +322,22 @@ function InitializeChatServer() {
         // BACK BUTTON
         $(document).on("click", "#BackToChatSelectorButton", function () {
             $(".SelectReceiver > *").addClass("animated slideInLeft");
+            $(".ChatTab .headerWrap .header .HeaderCaption").hide();
+            $(".ChatTab .headerWrap .header .HeaderCaption.TabCaption").show();
             $(".ChatTab .headerWrap .LeftButtonHeader").html("<i class='fas fa-bars'></i>"); // REPLACE BACK BUTTON WITH MENU BUTTON
             SelectedReceiver.hide();
             SelectReceiver.show();
         });
 
+        // USER STOPS TYPING ON PAGE LEAVE
+        window.history.pushState({page: 1}, "", "");
+        window.onpopstate = function (event) {
+            if (event) {
+                sendStopTyping();
+            }
+        };
         $(window).unload(function () {
-            sendStopTyping(); // USER STOPS TYPING ON PAGE UNLOAD
+            sendStopTyping();
         });
     };
 }
diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/main.js b/main/app/sprinkles/core/assets/SiteAssets/js/main.js
index 26ce2d3..4b89a59 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/js/main.js
+++ b/main/app/sprinkles/core/assets/SiteAssets/js/main.js
@@ -196,4 +196,4 @@ $(document).ready(function () {
             alerts.ufAlerts().ufAlerts('fetch');
         }
     });
-});
+});
\ No newline at end of file
diff --git a/main/app/sprinkles/core/templates/pages/index.html.twig b/main/app/sprinkles/core/templates/pages/index.html.twig
index 48e9149..5f8fe76 100644
--- a/main/app/sprinkles/core/templates/pages/index.html.twig
+++ b/main/app/sprinkles/core/templates/pages/index.html.twig
@@ -55,7 +55,7 @@
                 <div class="headerWrap">
                     <div class="header">
                         <span class="LeftButtonHeader"><i class="fas fa-bars"></i></span>
-                        <span class="HeaderCaption">{{ translate("TAB_CAPTIONS.CHAT") }}</span>
+                        <span class="HeaderCaption TabCaption">{{ translate("TAB_CAPTIONS.CHAT") }}</span>
                         <span class="RightButtonHeader"><i class="fas fa-bell"></i></span>
                     </div>
                     <hr class="ChatHeaderDivider">
-- 
cgit v1.2.3