diff options
| author | Simon Knox <psimyn@gmail.com> | 2017-07-19 12:48:44 +1000 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-07-19 12:48:44 +1000 |
| commit | 3d4f28951b275aca370b80a52c7e1e8057326243 (patch) | |
| tree | c63c153edbccd9dc880cbb9201cb9630b008791f | |
| parent | 11f9ac0a48b62cef25eedede4c1819964f08d5ce (diff) | |
| download | gitlab-ce-33237-mr-tab-jump.tar.gz | |
prevent MR tabs from jumping when switching between them33237-mr-tab-jump
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 5 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show.html.haml | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 7840f05a8ae..bcb07ba17f5 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -126,6 +126,11 @@ import BlobForkSuggestion from './blob/blob_fork_suggestion'; const $target = $(e.target); const action = $target.data('action'); + if (window.location.search == '?test') { + const minHeight = window.innerHeight - document.querySelector('.merge-request-tabs').getBoundingClientRect().bottom; + $('.tab-content').css({ minHeight }); + } + if (action === 'commits') { this.loadCommits($target.attr('href')); this.expandView(); diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml index 2efc1d68190..58fe0ccefec 100644 --- a/app/views/projects/merge_requests/show.html.haml +++ b/app/views/projects/merge_requests/show.html.haml @@ -65,6 +65,9 @@ = render "discussions/new_issue_for_all_discussions", merge_request: @merge_request = render "discussions/jump_to_next" + .mr-loading-status + = spinner + .tab-content#diff-notes-app #notes.notes.tab-pane.voting_notes .row @@ -80,9 +83,6 @@ #diffs.diffs.tab-pane -# This tab is always loaded via AJAX - .mr-loading-status - = spinner - = render 'shared/issuable/sidebar', issuable: @merge_request - if @merge_request.can_be_reverted?(current_user) = render "projects/commit/change", type: 'revert', commit: @merge_request.merge_commit, title: @merge_request.title |