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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
5848f283
Commit
5848f283
authored
Apr 25, 2019
by
Jan Beckmann
Committed by
Phil Hughes
Apr 25, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Escape special characters in GFM auto complete highlighting
Fixes #60552
parent
3fe07ce7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
47 additions
and
0 deletions
+47
-0
app/assets/javascripts/gfm_auto_complete.js
app/assets/javascripts/gfm_auto_complete.js
+10
-0
changelogs/unreleased/60552-period-dropdown.yml
changelogs/unreleased/60552-period-dropdown.yml
+5
-0
spec/frontend/gfm_auto_complete_spec.js
spec/frontend/gfm_auto_complete_spec.js
+32
-0
No files found.
app/assets/javascripts/gfm_auto_complete.js
View file @
5848f283
...
@@ -477,6 +477,16 @@ class GfmAutoComplete {
...
@@ -477,6 +477,16 @@ class GfmAutoComplete {
}
}
return
null
;
return
null
;
},
},
highlighter
(
li
,
query
)
{
// override default behaviour to escape dot character
// see https://github.com/ichord/At.js/pull/576
if
(
!
query
)
{
return
li
;
}
const
escapedQuery
=
query
.
replace
(
/
[
.+
]
/
,
'
\\
$&
'
);
const
regexp
=
new
RegExp
(
`>\\s*([^<]*?)(
${
escapedQuery
}
)([^<]*)\\s*<`
,
'
ig
'
);
return
li
.
replace
(
regexp
,
(
str
,
$1
,
$2
,
$3
)
=>
`>
${
$1
}
<strong>
${
$2
}
</strong>
${
$3
}
<`
);
},
};
};
}
}
...
...
changelogs/unreleased/60552-period-dropdown.yml
0 → 100644
View file @
5848f283
---
title
:
Fix autocomplete dropdown for usernames starting with period
merge_request
:
27533
author
:
Jan Beckmann
type
:
fixed
spec/frontend/gfm_auto_complete_spec.js
View file @
5848f283
...
@@ -209,6 +209,38 @@ describe('GfmAutoComplete', () => {
...
@@ -209,6 +209,38 @@ describe('GfmAutoComplete', () => {
});
});
});
});
describe
(
'
DefaultOptions.highlighter
'
,
()
=>
{
beforeEach
(()
=>
{
atwhoInstance
=
{
setting
:
{}
};
});
it
(
'
should return li if no query is given
'
,
()
=>
{
const
liTag
=
'
<li></li>
'
;
const
highlightedTag
=
gfmAutoCompleteCallbacks
.
highlighter
.
call
(
atwhoInstance
,
liTag
);
expect
(
highlightedTag
).
toEqual
(
liTag
);
});
it
(
'
should highlight search query in li element
'
,
()
=>
{
const
liTag
=
'
<li><img src="" />string</li>
'
;
const
query
=
'
s
'
;
const
highlightedTag
=
gfmAutoCompleteCallbacks
.
highlighter
.
call
(
atwhoInstance
,
liTag
,
query
);
expect
(
highlightedTag
).
toEqual
(
'
<li><img src="" /> <strong>s</strong>tring </li>
'
);
});
it
(
'
should highlight search query with special char in li element
'
,
()
=>
{
const
liTag
=
'
<li><img src="" />te.st</li>
'
;
const
query
=
'
.
'
;
const
highlightedTag
=
gfmAutoCompleteCallbacks
.
highlighter
.
call
(
atwhoInstance
,
liTag
,
query
);
expect
(
highlightedTag
).
toEqual
(
'
<li><img src="" /> te<strong>.</strong>st </li>
'
);
});
});
describe
(
'
isLoading
'
,
()
=>
{
describe
(
'
isLoading
'
,
()
=>
{
it
(
'
should be true with loading data object item
'
,
()
=>
{
it
(
'
should be true with loading data object item
'
,
()
=>
{
expect
(
GfmAutoComplete
.
isLoading
({
name
:
'
loading
'
})).
toBe
(
true
);
expect
(
GfmAutoComplete
.
isLoading
({
name
:
'
loading
'
})).
toBe
(
true
);
...
...
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