Merge branch '53796-discard-draft-comment-button-to-easy-to-accidentally-hit-on-mobile' into 'master'
Resolve "Discard draft comment button to easy to accidentally hit on mobile" Closes #53796 See merge request gitlab-org/gitlab-ce!24185
This commit is contained in:
commit
c24fe9a188
|
@ -51,8 +51,6 @@ export default class GLForm {
|
|||
// form and textarea event listeners
|
||||
this.addEventListeners();
|
||||
addMarkdownListeners(this.form);
|
||||
// hide discard button
|
||||
this.form.find('.js-note-discard').hide();
|
||||
this.form.show();
|
||||
if (this.isAutosizeable) this.setupAutosize();
|
||||
}
|
||||
|
|
|
@ -138,8 +138,6 @@ export default class Notes {
|
|||
this.$wrapperEl.on('click', '.js-note-delete', this.removeNote);
|
||||
// delete note attachment
|
||||
this.$wrapperEl.on('click', '.js-note-attachment-delete', this.removeAttachment);
|
||||
// reset main target form when clicking discard
|
||||
this.$wrapperEl.on('click', '.js-note-discard', this.resetMainTargetForm);
|
||||
// update the file name when an attachment is selected
|
||||
this.$wrapperEl.on('change', '.js-note-attachment-input', this.updateFormAttachment);
|
||||
// reply to diff/discussion notes
|
||||
|
@ -191,7 +189,6 @@ export default class Notes {
|
|||
this.$wrapperEl.off('keyup input', '.js-note-text');
|
||||
this.$wrapperEl.off('click', '.js-note-target-reopen');
|
||||
this.$wrapperEl.off('click', '.js-note-target-close');
|
||||
this.$wrapperEl.off('click', '.js-note-discard');
|
||||
this.$wrapperEl.off('keydown', '.js-note-text');
|
||||
this.$wrapperEl.off('click', '.js-comment-resolve-button');
|
||||
this.$wrapperEl.off('click', '.system-note-commit-list-toggler');
|
||||
|
@ -986,11 +983,9 @@ export default class Notes {
|
|||
form.find('#note_position').val(dataHolder.attr('data-position'));
|
||||
|
||||
form
|
||||
.find('.js-note-discard')
|
||||
.find('.js-close-discussion-note-form')
|
||||
.show()
|
||||
.removeClass('js-note-discard')
|
||||
.addClass('js-close-discussion-note-form')
|
||||
.text(form.find('.js-close-discussion-note-form').data('cancelText'));
|
||||
.removeClass('hide');
|
||||
form.find('.js-note-target-close').remove();
|
||||
form.find('.js-note-new-discussion').remove();
|
||||
this.setupNoteForm(form);
|
||||
|
@ -1194,12 +1189,11 @@ export default class Notes {
|
|||
}
|
||||
|
||||
updateTargetButtons(e) {
|
||||
var closebtn, closetext, discardbtn, form, reopenbtn, reopentext, textarea;
|
||||
var closebtn, closetext, form, reopenbtn, reopentext, textarea;
|
||||
textarea = $(e.target);
|
||||
form = textarea.parents('form');
|
||||
reopenbtn = form.find('.js-note-target-reopen');
|
||||
closebtn = form.find('.js-note-target-close');
|
||||
discardbtn = form.find('.js-note-discard');
|
||||
|
||||
if (textarea.val().trim().length > 0) {
|
||||
reopentext = reopenbtn.attr('data-alternative-text');
|
||||
|
@ -1216,9 +1210,6 @@ export default class Notes {
|
|||
if (closebtn.is(':not(.btn-comment-and-close)')) {
|
||||
closebtn.addClass('btn-comment-and-close');
|
||||
}
|
||||
if (discardbtn.is(':hidden')) {
|
||||
return discardbtn.show();
|
||||
}
|
||||
} else {
|
||||
reopentext = reopenbtn.data('originalText');
|
||||
closetext = closebtn.data('originalText');
|
||||
|
@ -1234,9 +1225,6 @@ export default class Notes {
|
|||
if (closebtn.is('.btn-comment-and-close')) {
|
||||
closebtn.removeClass('btn-comment-and-close');
|
||||
}
|
||||
if (discardbtn.is(':visible')) {
|
||||
return discardbtn.hide();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -431,15 +431,6 @@ append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"
|
|||
:label="issueActionButtonTitle"
|
||||
@click="handleSave(true);"
|
||||
/>
|
||||
|
||||
<button
|
||||
v-if="note.length"
|
||||
type="button"
|
||||
class="btn btn-cancel js-note-discard"
|
||||
@click="discard"
|
||||
>
|
||||
Discard draft
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
|
|
@ -40,5 +40,5 @@
|
|||
|
||||
= yield(:note_actions)
|
||||
|
||||
%a.btn.btn-cancel.js-note-discard{ role: "button", data: {cancel_text: "Cancel" } }
|
||||
Discard draft
|
||||
%a.btn.btn-cancel.js-close-discussion-note-form.hide{ role: "button", data: {cancel_text: "Cancel" } }
|
||||
Cancel
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Removed discard draft comment button form notes
|
||||
merge_request: 24185
|
||||
author:
|
||||
type: removed
|
|
@ -223,7 +223,6 @@ describe('issue_comment_form component', () => {
|
|||
'Comment & close issue',
|
||||
);
|
||||
|
||||
expect(vm.$el.querySelector('.js-note-discard')).toBeDefined();
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue