diff options
| author | Jan Beckmann <king-jan1999@hotmail.de> | 2018-03-11 20:02:55 +0100 |
|---|---|---|
| committer | Jan Beckmann <king-jan1999@hotmail.de> | 2018-03-11 20:21:53 +0100 |
| commit | 2542d7e0a2f517eb739f2ac72a271a203aa4ad13 (patch) | |
| tree | cc7511fb13f6053bfdef751239472c9121ea7840 | |
| parent | afd2d381119c3778140c3dd63c7ef24ecdb4c62e (diff) | |
| download | gitlab-ce-2542d7e0a2f517eb739f2ac72a271a203aa4ad13.tar.gz | |
Hide emoji popup after multiple spaces or blank lines
Fixes #40620,#33678
| -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 57a1fa107e5..28c04b36d45 100644 --- a/app/assets/javascripts/gfm_auto_complete.js +++ b/app/assets/javascripts/gfm_auto_complete.js @@ -131,9 +131,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 |