Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Felix Niklas 2016-03-22 08:33:49 +01:00
commit b0c14b81d5
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/app/controllers/widget/online_notification.coffee
View file

@ -58,7 +58,6 @@ class App.OnlineNotificationWidget extends App.Controller
) )
$(window).on 'click.notifications', @hide $(window).on 'click.notifications', @hide
$(window).on 'keydown.notifications', @listNavigate
@updateContent() @updateContent()
@ -207,11 +206,13 @@ class App.OnlineNotificationWidget extends App.Controller
@show() @show()
show: => show: =>
$(window).on 'keydown.notifications', @listNavigate
@shown = true @shown = true
@el.show() @el.show()
@updateHeight() @updateHeight()
hide: => hide: =>
$(window).off 'keydown.notifications'
@shown = false @shown = false
@el.hide() @el.hide()