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 2015-11-10 14:19:59 +01:00
parent 16456b3043 5faef94131
commit 92264a55e2
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/assets/javascripts/app/controllers/ticket_zoom.coffee
View file

@ -17,8 +17,6 @@ class App.TicketZoom extends App.Controller
App.TaskManager.remove(@task_key) App.TaskManager.remove(@task_key)
return return
@navupdate '#'
@form_meta = undefined @form_meta = undefined
@ticket_id = params.ticket_id @ticket_id = params.ticket_id
@article_id = params.article_id @article_id = params.article_id
@ -104,7 +102,7 @@ class App.TicketZoom extends App.Controller
# set all notifications to seen # set all notifications to seen
App.OnlineNotification.seen('Ticket', @ticket_id) App.OnlineNotification.seen('Ticket', @ticket_id)
# if controller is executed twice, go to latest article # if controller is executed twice, go to latest article (e. g. click on notification)
if @activeState if @activeState
@scrollToBottom() @scrollToBottom()
return return
@ -113,13 +111,18 @@ class App.TicketZoom extends App.Controller
# start autosave # start autosave
@autosaveStart() @autosaveStart()
# if ticket is shown the first time
if !@shown if !@shown
@shown = true
# trigger shown to article # trigger shown to article
App.Event.trigger('ui::ticket::shown', { ticket_id: @ticket_id }) App.Event.trigger('ui::ticket::shown', { ticket_id: @ticket_id })
# observe content header position # scroll to end of page
@positionPageHeaderStart() @scrollToBottom()
# observe content header position
@positionPageHeaderStart()
hide: => hide: =>
@activeState = false @activeState = false