From 873b88580ea1f10cde8bc9a278ae099e47ad3def Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Wed, 25 Jun 2014 11:55:59 +0600 Subject: [PATCH] SONAR-5209 Scrolling --- sonar-server/src/main/coffee/component-viewer/app.coffee | 6 ++++++ .../main/coffee/component-viewer/duplication-popup.coffee | 3 ++- sonar-server/src/main/coffee/component-viewer/main.coffee | 7 +++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/sonar-server/src/main/coffee/component-viewer/app.coffee b/sonar-server/src/main/coffee/component-viewer/app.coffee index aab3912ddc1..7b3e11fd674 100644 --- a/sonar-server/src/main/coffee/component-viewer/app.coffee +++ b/sonar-server/src/main/coffee/component-viewer/app.coffee @@ -61,7 +61,12 @@ requirejs [ if params.line? viewer.sourceView.highlightedLine = params.line + viewer.on 'sized', -> + viewer.off 'sized' + viewer.scrollToLine params.line + viewer.open params.component + viewer.on 'loaded', -> if params.tab? && params.item? && params.period? viewer.headerView.enableBar(params.tab).done -> @@ -85,6 +90,7 @@ requirejs [ else viewer.showAllLines() + # Message bundles l10nXHR = window.requestMessages() diff --git a/sonar-server/src/main/coffee/component-viewer/duplication-popup.coffee b/sonar-server/src/main/coffee/component-viewer/duplication-popup.coffee index 784f875795b..ebd2b77d07f 100644 --- a/sonar-server/src/main/coffee/component-viewer/duplication-popup.coffee +++ b/sonar-server/src/main/coffee/component-viewer/duplication-popup.coffee @@ -24,7 +24,8 @@ define [ goToFile: (e) -> key = $(e.currentTarget).data 'key' line = $(e.currentTarget).data 'line' - return if key == @options.main.component.get 'key' + if key == @options.main.component.get 'key' + return @options.main.scrollToLine line files = @options.main.source.get('duplicationFiles') @options.main.addTransition 'duplication', @collection.map (item) -> file = files[item.get('_ref')] diff --git a/sonar-server/src/main/coffee/component-viewer/main.coffee b/sonar-server/src/main/coffee/component-viewer/main.coffee index e5271366e03..62618a4757a 100644 --- a/sonar-server/src/main/coffee/component-viewer/main.coffee +++ b/sonar-server/src/main/coffee/component-viewer/main.coffee @@ -295,9 +295,12 @@ define [ scrollToLine: (line) -> - @scrolled = line row = @sourceView.$(".row[data-line-number=#{line}]") - return unless row.length > 0 + unless row.length > 0 + unless @scrolled + setTimeout (=> @scrollToLine(line)), 100 + return + @scrolled = line d = row.offset().top - @$el.offset().top - SCROLL_OFFSET @scrollPlusDelta d -- 2.39.5