fix notification remove overflow bug
This commit is contained in:
parent
b0ac1ddc1e
commit
087e83940f
1 changed files with 6 additions and 8 deletions
|
@ -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')
|
||||
|
||||
|
|
Loading…
Reference in a new issue