From 087e83940ff379f7a96024efc7efbe4a44bfa48c Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 14 Mar 2016 16:46:43 +0100 Subject: [PATCH] fix notification remove overflow bug --- .../controllers/widget/online_notification.coffee | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/app/controllers/widget/online_notification.coffee b/app/assets/javascripts/app/controllers/widget/online_notification.coffee index 5fdb749f3..dba5a50a7 100644 --- a/app/assets/javascripts/app/controllers/widget/online_notification.coffee +++ b/app/assets/javascripts/app/controllers/widget/online_notification.coffee @@ -113,9 +113,7 @@ class App.OnlineNotificationWidget extends App.Controller processData: true ) - onShow: => - @updateContent() - + updateHeight: => # set height of notification popover notificationsContainer = $('.js-notificationsContainer') heightApp = $('#app').height() @@ -131,6 +129,10 @@ class App.OnlineNotificationWidget extends App.Controller notificationsContainer.find('.popover-content').css('height', "#{heightPopoverContentNew}px") + onShow: => + @updateContent() + @updateHeight() + # mark all notifications as read notificationsContainer.find('.js-markAllAsRead').on('click', (e) => e.preventDefault() @@ -221,7 +223,7 @@ class App.OnlineNotificationWidget extends App.Controller row = $(e.target).closest('.activity-entry') id = row.data('id') App.OnlineNotification.destroy(id) - @resetHeight() + @updateHeight() ) createContainer: => @@ -254,7 +256,3 @@ class App.OnlineNotificationWidget extends App.Controller @counterUpdate(0) @toggle.popover('destroy') - resetHeight: -> - notificationsContainer = $('.js-notificationsContainer') - notificationsContainer.find('.popover-content').css('height', 'auto') -