kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

IssueNotesRefactor: Address MR comments.

Browse source
This commit is contained in:
Fatih Acet 2017-07-14 20:16:56 +03:00
parent b26637c5b1
commit 3c2d98f4c2
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/issue.js
View file

@ -42,7 +42,7 @@ class Issue {
initIssueBtnEventListeners() {
const issueFailMessage = 'Unable to update this issue at this time.';
return $(document).on('click', '.issuable-actions a.btn-close, .issuable-actions a.btn-reopen', (e) => {
return $(document).on('click', '.js-issuable-actions a.btn-close, .js-issuable-actions a.btn-reopen', (e) => {
var $button, shouldSubmit, url;
e.preventDefault();
e.stopImmediatePropagation();

8
app/assets/javascripts/lib/utils/common_utils.js
View file

@ -161,12 +161,12 @@
};
gl.utils.scrollToElement = function($el) {
var top = $el.offset().top;
var mrTabsHeight = $('.merge-request-tabs').height() || 0;
var headerHeight = $('.navbar-gitlab').height() || 0;
const top = $el.offset().top;
const mrTabsHeight = $('.merge-request-tabs').height() || 0;
const headerHeight = $('.navbar-gitlab').height() || 0;
return $('body, html').animate({
scrollTop: top - mrTabsHeight - headerHeight
scrollTop: top - mrTabsHeight - headerHeight,
}, 200);
};

2
app/views/projects/issues/show.html.haml
View file

@ -22,7 +22,7 @@
= confidential_icon(@issue)
= issuable_meta(@issue, @project, "Issue")
.issuable-actions
.issuable-actions.js-issuable-actions
.clearfix.issue-btn-group.dropdown
%button.btn.btn-default.pull-left.hidden-md.hidden-lg{ type: "button", data: { toggle: "dropdown" } }
Options

2
app/views/projects/merge_requests/_mr_title.html.haml
View file

@ -17,7 +17,7 @@
.issuable-meta
= issuable_meta(@merge_request, @project, "Merge request")
.issuable-actions
.issuable-actions.js-issuable-actions
.clearfix.issue-btn-group.dropdown
%button.btn.btn-default.pull-left.hidden-md.hidden-lg{ type: "button", data: { toggle: "dropdown" } }
Options