diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-05 12:23:23 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-05 12:23:23 +0000 |
| commit | 3137d155caeeebc5de7ad8887456f64e86296729 (patch) | |
| tree | 8bda7154af48bffb525be97d2e53825e250d4e6f | |
| parent | 66fa6070e88cc273cb902f58bc36c68791a3b26b (diff) | |
| parent | 31330e4a3c7d21e4a86b86fd0f199a857d777a3b (diff) | |
| download | gitlab-ce-3137d155caeeebc5de7ad8887456f64e86296729.tar.gz | |
Merge branch 'fix_scroll_on_diff_tab' into 'master'
Fix anchors to comments in diffs
https://gitlab.com/gitlab-org/gitlab-ce/issues/2218
See merge request !1508
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js.coffee | 7 |
2 files changed, 8 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..4e56791bde4 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -66,6 +66,11 @@ class @MergeRequestTabs @setCurrentAction(action) + scrollToElement: (container) -> + if window.location.hash + top = $(container + " " + 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 +127,7 @@ class @MergeRequestTabs document.getElementById('commits').innerHTML = data.html $('.js-timeago').timeago() @commitsLoaded = true + @scrollToElement(".commits") loadDiff: (source) -> return if @diffsLoaded @@ -131,6 +137,7 @@ class @MergeRequestTabs success: (data) => document.getElementById('diffs').innerHTML = data.html @diffsLoaded = true + @scrollToElement(".diffs") toggleLoading: -> $('.mr-loading-status .loading').toggle() |