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

Change the reply shortcut to focus the field even without a selection.

Browse source
This commit is contained in:
Brian Hall 2017-01-30 22:12:31 -06:00
parent b78d06b781
commit 7bf6df8463
4 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/lib/utils/common_utils.js.es6
View file

@ -162,6 +162,7 @@
w.gl.utils.getSelectedFragment = () => { w.gl.utils.getSelectedFragment = () => {
const selection = window.getSelection(); const selection = window.getSelection();
if (selection.rangeCount === 0) return null;
const documentFragment = selection.getRangeAt(0).cloneContents(); const documentFragment = selection.getRangeAt(0).cloneContents();
if (documentFragment.textContent.length === 0) return null; if (documentFragment.textContent.length === 0) return null;

9
app/assets/javascripts/shortcuts_issuable.js
View file

@ -39,17 +39,20 @@
} }
ShortcutsIssuable.prototype.replyWithSelectedText = function() { ShortcutsIssuable.prototype.replyWithSelectedText = function() {
var quote, replyField, documentFragment, selected, separator; var quote, documentFragment, selected, separator;
var replyField = $('.js-main-target-form #note_note');
documentFragment = window.gl.utils.getSelectedFragment(); documentFragment = window.gl.utils.getSelectedFragment();
if (!documentFragment) return; if (!documentFragment) {
replyField.focus();
return;
}
// If the documentFragment contains more than just Markdown, don't copy as GFM. // If the documentFragment contains more than just Markdown, don't copy as GFM.
if (documentFragment.querySelector('.md, .wiki')) return; if (documentFragment.querySelector('.md, .wiki')) return;
selected = window.gl.CopyAsGFM.nodeToGFM(documentFragment); selected = window.gl.CopyAsGFM.nodeToGFM(documentFragment);
replyField = $('.js-main-target-form #note_note');
if (selected.trim() === "") { if (selected.trim() === "") {
return; return;
} }

4
changelogs/unreleased/empty-selection-reply-shortcut.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: Change the reply shortcut to focus the field even without a selection.
merge_request: 8873
author: Brian Hall

12
spec/javascripts/shortcuts_issuable_spec.js
View file

@ -27,11 +27,19 @@
return this.selector = 'form.js-main-target-form textarea#note_note'; return this.selector = 'form.js-main-target-form textarea#note_note';
}); });
describe('with empty selection', function() { describe('with empty selection', function() {
return it('does nothing', function() { it('does not return an error', function() {
stubSelection('');
this.shortcut.replyWithSelectedText(); this.shortcut.replyWithSelectedText();
return expect($(this.selector).val()).toBe(''); return expect($(this.selector).val()).toBe('');
}); });
return it('triggers `input`', function() {
var focused;
focused = false;
$(this.selector).on('focus', function() {
return focused = true;
});
this.shortcut.replyWithSelectedText();
return expect(focused).toBe(true);
});
}); });
describe('with any selection', function() { describe('with any selection', function() {
beforeEach(function() { beforeEach(function() {