diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-14 10:39:02 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-14 10:39:02 +0000 |
| commit | 7e4fcbf9bec34bb4c8e023f3726a99273850f800 (patch) | |
| tree | 3a0838c71f51a03a7bb22cddd9640a5367f44ff6 | |
| parent | d5793292d2a9d30740fd64aaa0873f24d8579ce7 (diff) | |
| parent | 2542d7e0a2f517eb739f2ac72a271a203aa4ad13 (diff) | |
| download | gitlab-ce-7e4fcbf9bec34bb4c8e023f3726a99273850f800.tar.gz | |
Merge branch 'fix-emoji-popup' into 'master'
Hide emoji popup after multiple spaces or blank lines, closes #40620,#33678
Closes #40620 and #33678
See merge request gitlab-org/gitlab-ce!17680
| -rw-r--r-- | app/assets/javascripts/gfm_auto_complete.js | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-emoji-popup.yml | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/gfm_auto_complete.js b/app/assets/javascripts/gfm_auto_complete.js index 43a5325cf71..8259133c95b 100644 --- a/app/assets/javascripts/gfm_auto_complete.js +++ b/app/assets/javascripts/gfm_auto_complete.js @@ -132,9 +132,8 @@ class GfmAutoComplete { callbacks: { ...this.getDefaultCallbacks(), matcher(flag, subtext) { - const relevantText = subtext.trim().split(/\s/).pop(); const regexp = new RegExp(`(?:[^${glRegexp.unicodeLetters}0-9:]|\n|^):([^:]*)$`, 'gi'); - const match = regexp.exec(relevantText); + const match = regexp.exec(subtext); return match && match.length ? match[1] : null; }, diff --git a/changelogs/unreleased/fix-emoji-popup.yml b/changelogs/unreleased/fix-emoji-popup.yml new file mode 100644 index 00000000000..c81d061a5d7 --- /dev/null +++ b/changelogs/unreleased/fix-emoji-popup.yml @@ -0,0 +1,5 @@ +--- +title: Hide emoji popup after multiple spaces +merge_request: +author: Jan Beckmann +type: fixed |