From c76f839ea724da595522ad5033ace69c1a58acdc Mon Sep 17 00:00:00 2001 From: Andreas Nedbal Date: Thu, 7 May 2020 20:36:14 +0200 Subject: [PATCH] Fixed announcement JavaScript functionality --- app/assets/javascripts/application.js.erb.coffee | 8 ++++---- app/views/shared/_announcements.haml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/application.js.erb.coffee b/app/assets/javascripts/application.js.erb.coffee index fd54a6d7..ae5efb02 100644 --- a/app/assets/javascripts/application.js.erb.coffee +++ b/app/assets/javascripts/application.js.erb.coffee @@ -73,13 +73,13 @@ _ready = -> lineColor: bodyColor density: 23000 - $(".alert-announcement").each -> + $(".announcement").each -> aId = $(this)[0].dataset.announcementId unless (window.localStorage.getItem("announcement#{aId}")) - $(this).toggleClass("hidden") + $(this).toggleClass("d-none") - $(document).on "click", ".alert-announcement button.close", (evt) -> - announcement = event.target.closest(".alert-announcement") + $(document).on "click", ".announcement button.close", (evt) -> + announcement = event.target.closest(".announcement") aId = announcement.dataset.announcementId window.localStorage.setItem("announcement#{aId}", true) diff --git a/app/views/shared/_announcements.haml b/app/views/shared/_announcements.haml index 68036ff8..3f4bab7b 100644 --- a/app/views/shared/_announcements.haml +++ b/app/views/shared/_announcements.haml @@ -1,6 +1,6 @@ .announcement__container - @active_announcements.each do |announcement| - .alert.announcement.alert-info.alert-dismissable.hidden{ data: { 'announcement-id': announcement.id } } + .alert.announcement.alert-info.alert-dismissable.d-none{ data: { 'announcement-id': announcement.id } } .container %button.close{ type: "button", "data-dismiss" => "alert" } %span{ "aria-hidden" => "true" } ×