Merge branch 'master' of github.com:martini/zammad
This commit is contained in:
commit
9ac0301e71
1 changed files with 2 additions and 0 deletions
|
@ -105,6 +105,7 @@ class App.ChatWidget extends App.Controller
|
||||||
|
|
||||||
show: =>
|
show: =>
|
||||||
@isShown = true
|
@isShown = true
|
||||||
|
@el.find('#chat_toogle').html('×');
|
||||||
if @newMessage
|
if @newMessage
|
||||||
@el.find('div.well').addClass('alert-success')
|
@el.find('div.well').addClass('alert-success')
|
||||||
@delay( =>
|
@delay( =>
|
||||||
|
@ -138,6 +139,7 @@ class App.ChatWidget extends App.Controller
|
||||||
hide: =>
|
hide: =>
|
||||||
@isShown = false
|
@isShown = false
|
||||||
@el.find('#chat_content').hide(100)
|
@el.find('#chat_content').hide(100)
|
||||||
|
@el.find('#chat_toogle').html('♦');
|
||||||
|
|
||||||
focusIn: =>
|
focusIn: =>
|
||||||
@focus = true
|
@focus = true
|
||||||
|
|
Loading…
Reference in a new issue