From 7d2bcd7b888680e074f4cb7333907874ab6e5c14 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 10 Jul 2012 14:06:58 +0200 Subject: [PATCH] Improved scroll to in ticket zoom if article_id is given. --- .../app/controllers/_application_controller.js.coffee | 3 ++- .../app/controllers/agent_ticket_zoom.js.coffee | 9 +++++++++ .../javascripts/app/views/agent_ticket_zoom.jst.eco | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_application_controller.js.coffee b/app/assets/javascripts/app/controllers/_application_controller.js.coffee index 88f6005f5..ad6c3a091 100644 --- a/app/assets/javascripts/app/controllers/_application_controller.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller.js.coffee @@ -14,7 +14,8 @@ class App.Controller extends Spine.Controller scrollTo: ( x = 0, y = 0 ) -> a = -> - window.scrollTo( 0,0 ) + console.log('scollTo', x, y ) + window.scrollTo( x, y ) @delay( a, 0 ) diff --git a/app/assets/javascripts/app/controllers/agent_ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_zoom.js.coffee index 5ffb4573b..9c2eafd66 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_zoom.js.coffee @@ -24,6 +24,7 @@ class Index extends App.Controller @edit_form = undefined # @render() @ticket_id = params.ticket_id + @article_id = params.article_id @fetch(@ticket_id) fetch: (ticket_id) -> @@ -196,6 +197,14 @@ class Index extends App.Controller ticket: @ticket, ) + # scrall to article if given + if @article_id + offset = document.getElementById( 'article-' + @article_id ).offsetTop + offset = offset - 45 + scrollTo = -> + @scrollTo( 0, offset ) + @delay( scrollTo, 100 ) + @delay(@u, 200) u: => diff --git a/app/assets/javascripts/app/views/agent_ticket_zoom.jst.eco b/app/assets/javascripts/app/views/agent_ticket_zoom.jst.eco index ee89eb8f3..f78f9a38a 100644 --- a/app/assets/javascripts/app/views/agent_ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_zoom.jst.eco @@ -18,7 +18,7 @@
<% for article in @articles: %> -
+