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
Compare revisions
6a2ef20b7c6ee841c7bbe8e91249be23b4c649ae to 221db9f210b161851dd69bed87c49d0573d30e5f
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
pleroma/pleroma-fe
Select target project
No results found
221db9f210b161851dd69bed87c49d0573d30e5f
Select Git revision
Swap
Target
pleroma/pleroma-fe
Select target project
pleroma/pleroma-fe
eal/pleroma-fe
peterspark/pleroma-fe
hb2k8/pleroma-fe
tibike/pleroma-fe
obrez/pleroma-fe
partial/pleroma-fe
href/pleroma-fe
hakabahitoyo/pleroma-fe
hsgw/pleroma-fe
Azurolu/pleroma-fe
cobalto/pleroma-fe
qwexvf/pleroma-fe
boner.engineer/pleroma-fe
f0x/pleroma-fe
ataalik/pleroma-fe
normandy/pleroma-fe
Sir_Boops/pleroma-fe
morguldir/pleroma-fe
csaurus/pleroma-fe
kaniini/pleroma-fe
bhtooefr/pleroma-fe
andarna/pleroma-fe
ktsukik/pleroma-fe
Steph/pleroma-fe
andrewzah/pleroma-fe
lanodan/pleroma-fe
pea/pleroma-fe
fotfd/pleroma-fe
pizzaiolo/pleroma-fe
Syldexia/pleroma-fe
riking/pleroma-fe
dr1ft/pleroma-fe
animeirl/pleroma-fe
elomatreb/pleroma-fe
viv/pleroma-fe
goofy/pleroma-fe
hoodie/pleroma-fe
stolas/pleroma-fe
peterpan/pleroma-fe
Lumitas/pleroma-fe
Toromino/pleroma-fe
galen/pleroma-fe
scarlett/pleroma-fe
ButterflyOfFire/pleroma-fe
vaartis/pleroma-fe
meireikei/pleroma-fe
darko/pleroma-fe
pony/pleroma-fe
succfemboi/pleroma-fe
fadelkon/pleroma-fe
dgold/pleroma-fe
nebula_moe/pleroma-fe
vinzv/pleroma-fe
slice/pleroma-fe
rinpatch/pleroma-fe
maxf/pleroma-fe
raeno/pleroma-fe
oceanvald/pleroma-fe
nuklearfiziks/pleroma-fe
feld/pleroma-fe
minibikini/pleroma-fe
link0ff/pleroma-fe
qadeer/pleroma-fe
FloatingGhost/pleroma-fe
cascode/pleroma-fe
hikaruaikawa/pleroma-fe
kjwon15/pleroma-fe
ukrop/pleroma-fe
ilja/pleroma-fe
shadowfacts/pleroma-fe
edijs/pleroma-fe
jdorman632/pleroma-fe
xruselfmadex/pleroma-fe
futureweb/pleroma-fe
eugenijm/pleroma-fe
tae/pleroma-fe
Dave/pleroma-fe
jasper/pleroma-fe
Lidar/pleroma-fe
parallel588/pleroma-fe
jaredr/pleroma-fe
rondnelly/pleroma-fe
Aditoo/pleroma-fe
FongWan/pleroma-fe
mkljczk/pleroma-fe
nik/pleroma-fe
brendenbice1222/pleroma-fe
Satak/pleroma-fe
xse/pleroma-fe
moonman/pleroma-fe
Artik/pleroma-fe
ssuprunenko/pleroma-fe
uncletrunks/pleroma-fe
absturztaube/pleroma-fe
wyatt777/pleroma-fe
hauvophuoc/pleroma-fe
dashie/pleroma-fe
shmibs/pleroma-fe
Elepow/pleroma-fe
raven/pleroma-fe
buoyantair/pleroma-fe
Exilat_a_Tolosa/pleroma-fe
matrixsasuke/pleroma-fe
njoseph/pleroma-fe
ELR/pleroma-fe
sjw/pleroma-fe
davidyin/pleroma-fe
pescetarian/pleroma-fe
kphrx/pleroma-fe
mewmew/pleroma-fe
h3poteto/pleroma-fe
Alexpono/pleroma-fe
seven/pleroma-fe
mparvin/pleroma-fe
tuxcrafting/pleroma-fe
nekojanai/pleroma-fe
xenofem/pleroma-fe
p/pleroma-fe
creme/pleroma-fe
jp/pleroma-fe
Jeder/pleroma-fe
gensogrips/pleroma-fe
caskd/pleroma-fe
arkSong/pleroma-fe
Hikali/pleroma-fe
Duponin/pleroma-fe
gashapwn/pleroma-fe
fence/pleroma-fe
Duder-onomy/pleroma-fe
translate/pleroma-fe
okl/pleroma-fe
bird/pleroma-fe
NEETzsche/pleroma-fe
Ewoke19CMR/pleroma-fe
shevek/pleroma-fe
cutienautica/pleroma-fe
Nakaya/pleroma-fe
Snow/pleroma-fe
seanking/pleroma-fe
kkcake/pleroma-fe
Testacc/pleroma-fe
flxy/pleroma-fe
xerz/pleroma-fe
maronu/pleroma-fe
matildepark/pleroma-fe
Craftplacer/pleroma-fe
147 results
6a2ef20b7c6ee841c7bbe8e91249be23b4c649ae
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (4)
fix all known problems with clicks on autocomplete emojis
· 01bda605
HJ
authored
5 years ago
01bda605
lint fix
· 9dbafa4c
HJ
authored
5 years ago
9dbafa4c
review
· 82464b3a
HJ
authored
5 years ago
82464b3a
Merge branch 'fix-emoji-input' into 'develop'
· 221db9f2
HJ
authored
5 years ago
fix all known problems with clicks on autocomplete emojis See merge request
!857
221db9f2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/emoji-input/emoji-input.js
+15
-6
15 additions, 6 deletions
src/components/emoji-input/emoji-input.js
src/components/emoji-input/emoji-input.vue
+1
-1
1 addition, 1 deletion
src/components/emoji-input/emoji-input.vue
with
16 additions
and
7 deletions
src/components/emoji-input/emoji-input.js
View file @
221db9f2
...
...
@@ -59,7 +59,8 @@ const EmojiInput = {
input
:
undefined
,
highlighted
:
0
,
caret
:
0
,
focused
:
false
focused
:
false
,
blurTimeout
:
null
}
},
computed
:
{
...
...
@@ -122,12 +123,12 @@ const EmojiInput = {
this
.
$emit
(
'
input
'
,
newValue
)
this
.
caret
=
0
},
replaceText
(
e
)
{
replaceText
(
e
,
suggestion
)
{
const
len
=
this
.
suggestions
.
length
||
0
if
(
this
.
textAtCaret
.
length
===
1
)
{
return
}
if
(
len
>
0
)
{
const
s
uggestion
=
this
.
suggestions
[
this
.
highlighted
]
const
replacement
=
s
uggestion
.
replacement
if
(
len
>
0
||
suggestion
)
{
const
chosenS
uggestion
=
suggestion
||
this
.
suggestions
[
this
.
highlighted
]
const
replacement
=
chosenS
uggestion
.
replacement
const
newValue
=
Completion
.
replaceWord
(
this
.
value
,
this
.
wordAtCaret
,
replacement
)
this
.
$emit
(
'
input
'
,
newValue
)
this
.
highlighted
=
0
...
...
@@ -173,13 +174,21 @@ const EmojiInput = {
onBlur
(
e
)
{
// Clicking on any suggestion removes focus from autocomplete,
// preventing click handler ever executing.
setTimeout
(()
=>
{
this
.
blurTimeout
=
setTimeout
(()
=>
{
this
.
focused
=
false
this
.
setCaret
(
e
)
this
.
resize
()
},
200
)
},
onClick
(
e
,
suggestion
)
{
this
.
replaceText
(
e
,
suggestion
)
},
onFocus
(
e
)
{
if
(
this
.
blurTimeout
)
{
clearTimeout
(
this
.
blurTimeout
)
this
.
blurTimeout
=
null
}
this
.
focused
=
true
this
.
setCaret
(
e
)
this
.
resize
()
...
...
This diff is collapsed.
Click to expand it.
src/components/emoji-input/emoji-input.vue
View file @
221db9f2
...
...
@@ -6,7 +6,7 @@
<div
v-for=
"(suggestion, index) in suggestions"
:key=
"index"
@
click.stop.prevent=
"
replaceText
"
@
click.stop.prevent=
"
onClick($event, suggestion)
"
class=
"autocomplete-item"
:class=
"
{ highlighted: suggestion.highlighted }"
>
...
...
This diff is collapsed.
Click to expand it.