diff options
| author | Phil Hughes <me@iamphill.com> | 2016-04-14 16:52:01 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-04-20 17:25:16 +0100 |
| commit | 7bcacafc8a601896f8750f29fcde71f8f8ffb910 (patch) | |
| tree | 5359a0496e77a865ac56cc40176eabc08a5d9463 /app/assets | |
| parent | 364354bce442e2058491e549bbacfbea0c007c0d (diff) | |
| download | gitlab-ce-7bcacafc8a601896f8750f29fcde71f8f8ffb910.tar.gz | |
Fixed issue with incorrect line being highlighted if line is in discussion view
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js.coffee | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee index e8613cab72b..55e09c6acb9 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -176,12 +176,12 @@ class @MergeRequestTabs if locationHash isnt '' hashClassString = ".#{locationHash.replace('#', '')}" - $diffLine = $(locationHash) + $diffLine = $("#{locationHash}:not(.match)", $('#diffs')) - if $diffLine.is ':not(tr)' - $diffLine = $("td#{locationHash}, td#{hashClassString}") + if not $diffLine.is 'tr' + $diffLine = $('#diffs').find("td#{locationHash}, td#{hashClassString}") else - $diffLine = $('td', $diffLine) + $diffLine = $diffLine.find('td') if $diffLine.length $diffLine.addClass 'hll' |