Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
2542d7e0
Commit
2542d7e0
authored
Mar 11, 2018
by
Jan Beckmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hide emoji popup after multiple spaces or blank lines
Fixes #40620,#33678
parent
afd2d381
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
app/assets/javascripts/gfm_auto_complete.js
app/assets/javascripts/gfm_auto_complete.js
+1
-2
changelogs/unreleased/fix-emoji-popup.yml
changelogs/unreleased/fix-emoji-popup.yml
+5
-0
No files found.
app/assets/javascripts/gfm_auto_complete.js
View file @
2542d7e0
...
@@ -131,9 +131,8 @@ class GfmAutoComplete {
...
@@ -131,9 +131,8 @@ class GfmAutoComplete {
callbacks
:
{
callbacks
:
{
...
this
.
getDefaultCallbacks
(),
...
this
.
getDefaultCallbacks
(),
matcher
(
flag
,
subtext
)
{
matcher
(
flag
,
subtext
)
{
const
relevantText
=
subtext
.
trim
().
split
(
/
\s
/
).
pop
();
const
regexp
=
new
RegExp
(
`(?:[^
${
glRegexp
.
unicodeLetters
}
0-9:]|\n|^):([^:]*)$`
,
'
gi
'
);
const
regexp
=
new
RegExp
(
`(?:[^
${
glRegexp
.
unicodeLetters
}
0-9:]|\n|^):([^:]*)$`
,
'
gi
'
);
const
match
=
regexp
.
exec
(
relevantT
ext
);
const
match
=
regexp
.
exec
(
subt
ext
);
return
match
&&
match
.
length
?
match
[
1
]
:
null
;
return
match
&&
match
.
length
?
match
[
1
]
:
null
;
},
},
...
...
changelogs/unreleased/fix-emoji-popup.yml
0 → 100644
View file @
2542d7e0
---
title
:
Hide emoji popup after multiple spaces
merge_request
:
author
:
Jan Beckmann
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment