Merge branch 'develop' of github.com:martini/zammad into develop
This commit is contained in:
commit
dfc3c97825
1 changed files with 6 additions and 0 deletions
|
@ -165,6 +165,7 @@ class App.OnlineNotificationWidget extends App.Controller
|
|||
row = $(e.target).closest('.activity-entry')
|
||||
id = row.data('id')
|
||||
App.OnlineNotification.destroy(id)
|
||||
@resetHeight()
|
||||
)
|
||||
|
||||
createContainer: =>
|
||||
|
@ -196,3 +197,8 @@ class App.OnlineNotificationWidget extends App.Controller
|
|||
removeContainer: =>
|
||||
@counterUpdate(0)
|
||||
@toggle.popover('destroy')
|
||||
|
||||
resetHeight: ->
|
||||
notificationsContainer = $('.js-notificationsContainer')
|
||||
notificationsContainer.find('.popover-content').css('height', "auto")
|
||||
|
||||
|
|
Loading…
Reference in a new issue