From 35bd8622f735373d186abbcf71d496418bfa7064 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Wed, 28 Oct 2020 15:11:57 +0100 Subject: [PATCH] MDL-69878 core_message: always show message drawer close icon --- message/amd/build/message_drawer.min.js | Bin 4798 -> 4838 bytes message/amd/build/message_drawer.min.js.map | Bin 23567 -> 23850 bytes message/amd/src/message_drawer.js | 6 +++++- message/templates/message_drawer.mustache | 4 ++-- ...ssage_drawer_view_contacts_header.mustache | 2 +- ...e_drawer_view_conversation_header.mustache | 2 +- ...ssage_drawer_view_overview_header.mustache | 2 +- ...message_drawer_view_search_header.mustache | 2 +- ...ssage_drawer_view_settings_header.mustache | 2 +- theme/boost/scss/moodle/drawer.scss | 8 -------- theme/boost/style/moodle.css | 5 ----- theme/classic/style/moodle.css | 5 ----- 12 files changed, 12 insertions(+), 26 deletions(-) diff --git a/message/amd/build/message_drawer.min.js b/message/amd/build/message_drawer.min.js index bcb430f8a01977feef7872f9a525674dec4d4b6c..e5ea5a0c5c2447a4d83c476c0a0f98a152f29f14 100644 GIT binary patch delta 54 zcmdm|`b>4h0bbEmy|m1{6paEsXCMDy*LbJUkPv^r&98W^nI`Yz{jRHLnS4S7upm=A0zYs@HKi42ly|m1{6b+@!yn@matFp}E%%q%D QrOj7)t(i9a3e02z0DU+Vp#T5? diff --git a/message/amd/build/message_drawer.min.js.map b/message/amd/build/message_drawer.min.js.map index fad71131eaada256868441b66873d897800c29c5..4c16845b5d146f8a93eac75812967838ee4bff26 100644 GIT binary patch delta 131 zcmeC*!MJJ{&~J?vpc=joJKMbX*++H!oD)$jqJ<%0yR4YjU delta 133 zcmZ3ri?M$P_>gefMGTB>IWpk`bH#56=pa)QO>E`$98ca;4p_?VO=BrHh^;hOo l&&(?*EwL)gEY3{INu4YhAiDXD-(J?q^?~f0-9sO<0|4LoD`x-z diff --git a/message/amd/src/message_drawer.js b/message/amd/src/message_drawer.js index c36f8b03a9b..03a4866cc19 100644 --- a/message/amd/src/message_drawer.js +++ b/message/amd/src/message_drawer.js @@ -254,7 +254,7 @@ function( }); $(SELECTORS.JUMPTO).focus(function() { - var firstInput = $(SELECTORS.HEADER_CONTAINER).find('input:visible'); + var firstInput = root.find(SELECTORS.CLOSE_BUTTON); if (firstInput.length) { firstInput.focus(); } else { @@ -298,6 +298,10 @@ function( var closebutton = root.find(SELECTORS.CLOSE_BUTTON); closebutton.on(CustomEvents.events.activate, function() { + var button = $(SELECTORS.DRAWER).attr('data-origin'); + if (button) { + $('#' + button).focus(); + } PubSub.publish(Events.TOGGLE_VISIBILITY); }); diff --git a/message/templates/message_drawer.mustache b/message/templates/message_drawer.mustache index 215cf15d922..c29d841aa78 100644 --- a/message/templates/message_drawer.mustache +++ b/message/templates/message_drawer.mustache @@ -36,8 +36,8 @@ {{< core/drawer}} {{$drawercontent}}
-
- + diff --git a/message/templates/message_drawer_view_contacts_header.mustache b/message/templates/message_drawer_view_contacts_header.mustache index cef660d585e..ff09a4b124f 100644 --- a/message/templates/message_drawer_view_contacts_header.mustache +++ b/message/templates/message_drawer_view_contacts_header.mustache @@ -34,7 +34,7 @@ {} }} -