From e5764086487247c1447bbb48e95710e8c904752f Mon Sep 17 00:00:00 2001 From: Vera Rojman Date: Mon, 21 Jun 2021 17:28:04 +0200 Subject: [PATCH] Fix voted budgets and title bar hidden by focus mode (#18) --- .../app/cells/decidim/budgets/budgets_list/show.erb | 2 +- decidim-core/app/assets/javascripts/decidim/focus_mode.js.es6 | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/decidim-budgets/app/cells/decidim/budgets/budgets_list/show.erb b/decidim-budgets/app/cells/decidim/budgets/budgets_list/show.erb index 5c17faf8bda6..3bfb8ff27de7 100644 --- a/decidim-budgets/app/cells/decidim/budgets/budgets_list/show.erb +++ b/decidim-budgets/app/cells/decidim/budgets/budgets_list/show.erb @@ -1,4 +1,4 @@ -<% if !voting_finished? && (voted?) %> +<% if voted? %>

<%= t(:my_budgets, scope: i18n_scope) %> diff --git a/decidim-core/app/assets/javascripts/decidim/focus_mode.js.es6 b/decidim-core/app/assets/javascripts/decidim/focus_mode.js.es6 index 76002f02b41b..400386661c03 100644 --- a/decidim-core/app/assets/javascripts/decidim/focus_mode.js.es6 +++ b/decidim-core/app/assets/javascripts/decidim/focus_mode.js.es6 @@ -105,11 +105,13 @@ $(() => { } const initializeFocusMode = () => { + const focusModePresent = !!$focusModeOn.length; + $closer.on("click", () => { focusModeOff(FADEOUT_TIME) }); if ($opener.length) $opener.on("click", () => { focusModeOn(FADEOUT_TIME) }); - if (window.matchMedia('(min-width: 800px)').matches) { + if (focusModePresent > 0 && window.matchMedia('(min-width: 800px)').matches) { focusModeOn(0); } else { focusModeOff(0);