diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-10-05 13:12:26 +0300 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-10-05 13:12:26 +0300 |
| commit | 0bf3f8130f0c4a1efe9951077ac9c83b125df914 (patch) | |
| tree | caa9a10d6e598628019018cb260a5ce2b666476d | |
| parent | 0de7c83a78711601b40b5a739070da2e3af29b11 (diff) | |
| download | gitlab-ce-fix_scroll_on_diff_tab.tar.gz | |
Fix anchors to comments in diffsfix_scroll_on_diff_tab
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js.coffee | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index ec23d0f1172..05af03b9b1f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -29,6 +29,7 @@ v 8.1.0 (unreleased) - Ensure code blocks are properly highlighted after a note is updated - Fix wrong access level badge on MR comments - Hide password in the service settings form + - Fix anchors to comments in diffs v 8.0.3 - Fix URL shown in Slack notifications diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee index 19a07b6a033..761ab26638f 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -66,6 +66,10 @@ class @MergeRequestTabs @setCurrentAction(action) + scrollToElement: () -> + top = $(window.location.hash).offset().top + $('body').scrollTo(top); + # Activate a tab based on the current action activateTab: (action) -> action = 'notes' if action == 'show' @@ -122,6 +126,7 @@ class @MergeRequestTabs document.getElementById('commits').innerHTML = data.html $('.js-timeago').timeago() @commitsLoaded = true + @scrollToElement() loadDiff: (source) -> return if @diffsLoaded @@ -131,6 +136,7 @@ class @MergeRequestTabs success: (data) => document.getElementById('diffs').innerHTML = data.html @diffsLoaded = true + @scrollToElement() toggleLoading: -> $('.mr-loading-status .loading').toggle() |