From c268bc327a9c82acf05999039b0b3ab7191646eb Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 17 Jun 2021 10:14:23 +0000 Subject: fix issues with browser back button and minor cleanup --- view/js/main.js | 6 +++++- view/js/mod_hq.js | 7 ------- view/tpl/messages_widget.tpl | 5 ++--- 3 files changed, 7 insertions(+), 11 deletions(-) (limited to 'view') diff --git a/view/js/main.js b/view/js/main.js index a3f238a45..78bd790cd 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -204,8 +204,12 @@ $(document).ready(function() { }); window.onpopstate = function(e) { - if(e.state !== null && e.state.b64mid !== bParam_mid) + if(e.state !== null && e.state.b64mid !== bParam_mid) { prepareLiveUpdate(e.state.b64mid, ''); + $('.message').removeClass('active'); + $('[data-b64mid="' + e.state.b64mid + '"].message').addClass('active'); + } + }; //mod_mail only diff --git a/view/js/mod_hq.js b/view/js/mod_hq.js index ddcde4fcd..0a3939913 100644 --- a/view/js/mod_hq.js +++ b/view/js/mod_hq.js @@ -1,20 +1,13 @@ $(document).ready(function() { $(document).on('click', '#jot-toggle', function(e) { - e.preventDefault(); - e.stopPropagation(); $(window).scrollTop(0); $('#jot-popup').toggle(); - $('#profile-jot-text').focus(); - }); $(document).on('click', '#notes-toggle', function(e) { - e.preventDefault(); - e.stopPropagation(); $(window).scrollTop(0); $('#personal-notes').toggleClass('d-none'); - $('#note-text').focus(); }); }); diff --git a/view/tpl/messages_widget.tpl b/view/tpl/messages_widget.tpl index 7ba02e78e..079bcdf3a 100644 --- a/view/tpl/messages_widget.tpl +++ b/view/tpl/messages_widget.tpl @@ -1,4 +1,4 @@ -