Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
pleroma-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pleroma
pleroma-fe
Commits
2ea5bff3
Commit
2ea5bff3
authored
4 years ago
by
lain
Browse files
Options
Downloads
Plain Diff
Merge branch 'feat/tweak-autocomplete-search' into 'develop'
Autocomplete tweaks: remove search blocker, fix debounce params
#869
See merge request
!1149
parents
ebf4321e
4e0b4427
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!1217
2.1.0 into master
,
!1149
Autocomplete tweaks: remove search blocker, fix debounce params #869
Pipeline
#27389
passed
4 years ago
Stage: lint
Stage: build
Stage: test
Stage: deploy
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
src/components/emoji_input/suggestor.js
+3
-3
3 additions, 3 deletions
src/components/emoji_input/suggestor.js
src/modules/users.js
+3
-3
3 additions, 3 deletions
src/modules/users.js
with
7 additions
and
6 deletions
CHANGELOG.md
+
1
−
0
View file @
2ea5bff3
...
...
@@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
-
Uploading and drag-dropping multiple files works correctly now.
-
Subject field now appears disabled when posting
-
Fix status ellipsis menu being cut off in notifications column
-
Fixed autocomplete sometimes not returning the right user when there's already some results
## [2.0.3] - 2020-05-02
### Fixed
...
...
This diff is collapsed.
Click to expand it.
src/components/emoji_input/suggestor.js
+
3
−
3
View file @
2ea5bff3
...
...
@@ -13,7 +13,7 @@ import { debounce } from 'lodash'
const
debounceUserSearch
=
debounce
((
data
,
input
)
=>
{
data
.
updateUsersList
(
input
)
},
500
,
{
leading
:
true
,
trailing
:
false
}
)
},
500
)
export
default
data
=>
input
=>
{
const
firstChar
=
input
[
0
]
...
...
@@ -97,8 +97,8 @@ export const suggestUsers = data => input => {
replacement
:
'
@
'
+
screen_name
+
'
'
}))
// BE search users
if there are no matche
s
if
(
newUsers
.
length
===
0
&&
data
.
updateUsersList
)
{
// BE search users
to get more comprehensive result
s
if
(
data
.
updateUsersList
)
{
debounceUserSearch
(
data
,
noPrefix
)
}
return
newUsers
...
...
This diff is collapsed.
Click to expand it.
src/modules/users.js
+
3
−
3
View file @
2ea5bff3
...
...
@@ -428,10 +428,10 @@ const users = {
store
.
commit
(
'
setUserForNotification
'
,
notification
)
})
},
searchUsers
(
store
,
{
query
})
{
return
store
.
rootState
.
api
.
backendInteractor
.
searchUsers
({
query
})
searchUsers
(
{
rootState
,
commit
}
,
{
query
})
{
return
rootState
.
api
.
backendInteractor
.
searchUsers
({
query
})
.
then
((
users
)
=>
{
store
.
commit
(
'
addNewUsers
'
,
users
)
commit
(
'
addNewUsers
'
,
users
)
return
users
})
},
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment