Merge branch 'develop' of github.com:martini/zammad into develop

This commit is contained in:
Felix Niklas 2015-10-19 11:24:05 +02:00
commit dfc3c97825

View file

@ -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")