Skip to content
GitLab
Explorer
Connexion
S'inscrire
Navigation principale
Rechercher ou aller à…
Projet
P
parlote-facil
Gestion
Activité
Membres
Labels
Programmation
Tickets
Tableaux des tickets
Jalons
Wiki
Code
Requêtes de fusion
Dépôt
Branches
Validations
Étiquettes
Graphe du dépôt
Comparer les révisions
Extraits de code
Compilation
Pipelines
Jobs
Planifications de pipeline
Artéfacts
Déploiement
Releases
Registre de paquets
Registre de conteneur
Registre de modèles
Opération
Environnements
Modules Terraform
Surveillance
Incidents
Analyse
Données d'analyse des chaînes de valeur
Analyse des contributeurs
Données d'analyse CI/CD
Données d'analyse du dépôt
Expériences du modèle
Aide
Aide
Support
Documentation de GitLab
Comparer les forfaits GitLab
Forum de la communauté
Contribuer à GitLab
Donner votre avis
Raccourcis clavier
?
Extraits de code
Groupes
Projets
Afficher davantage de fils d'Ariane
facil
parlote-facil
Validations
6bb5e0a2
Valider
6bb5e0a2
rédigé
il y a 9 ans
par
Steffen van Bergerem
Validation de
Jonne Haß
il y a 9 ans
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
Only render hovercard if the mouse is still on the username
parent
a14713b9
Aucune branche associée trouvée
Branches contenant la validation
Aucune étiquette associée trouvée
Étiquettes contenant la validation
Aucune requête de fusion associée trouvée
Modifications
2
Masquer les modifications d'espaces
En ligne
Côte à côte
Affichage de
2 fichiers modifiés
Changelog.md
+1
-1
1 ajout, 1 suppression
Changelog.md
app/assets/javascripts/app/views/hovercard_view.js
+14
-10
14 ajouts, 10 suppressions
app/assets/javascripts/app/views/hovercard_view.js
avec
15 ajouts
et
11 suppressions
Changelog.md
+
1
−
1
Voir le fichier @
6bb5e0a2
...
@@ -149,7 +149,7 @@ diaspora* no longer adds a `div.container` to wrap custom splash pages. This add
...
@@ -149,7 +149,7 @@ diaspora* no longer adds a `div.container` to wrap custom splash pages. This add
*
Disable email notifications for closed user accounts
[
#5640
](
https://github.com/diaspora/diaspora/pull/5640
)
*
Disable email notifications for closed user accounts
[
#5640
](
https://github.com/diaspora/diaspora/pull/5640
)
*
Total user statistic no longer includes closed accounts
[
#5041
](
https://github.com/diaspora/diaspora/pull/5041
)
*
Total user statistic no longer includes closed accounts
[
#5041
](
https://github.com/diaspora/diaspora/pull/5041
)
*
Don't add a space when rendering a mention
[
#5711
](
https://github.com/diaspora/diaspora/pull/5711
)
*
Don't add a space when rendering a mention
[
#5711
](
https://github.com/diaspora/diaspora/pull/5711
)
*
Fix flickering hovercards
[
#5714
](
https://github.com/diaspora/diaspora/pull/5714
)
*
Fix flickering hovercards
[
#5714
](
https://github.com/diaspora/diaspora/pull/5714
)
[
#5876
]
(https://github.com/diaspora/diaspora/pull/5876)
*
Improved stripping markdown in post titles
[
#5730
](
https://github.com/diaspora/diaspora/pull/5730
)
*
Improved stripping markdown in post titles
[
#5730
](
https://github.com/diaspora/diaspora/pull/5730
)
*
Remove border from reply form for conversations
[
#5744
](
https://github.com/diaspora/diaspora/pull/5744
)
*
Remove border from reply form for conversations
[
#5744
](
https://github.com/diaspora/diaspora/pull/5744
)
*
Fix overflow for headings, blockquotes and other elements
[
#5731
](
https://github.com/diaspora/diaspora/pull/5731
)
*
Fix overflow for headings, blockquotes and other elements
[
#5731
](
https://github.com/diaspora/diaspora/pull/5731
)
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
app/assets/javascripts/app/views/hovercard_view.js
+
14
−
10
Voir le fichier @
6bb5e0a2
...
@@ -15,7 +15,7 @@ app.views.Hovercard = app.views.Base.extend({
...
@@ -15,7 +15,7 @@ app.views.Hovercard = app.views.Base.extend({
.
on
(
'
mouseenter
'
,
'
.hovercardable
'
,
_
.
bind
(
this
.
_mouseenterHandler
,
this
))
.
on
(
'
mouseenter
'
,
'
.hovercardable
'
,
_
.
bind
(
this
.
_mouseenterHandler
,
this
))
.
on
(
'
mouseleave
'
,
'
.hovercardable
'
,
_
.
bind
(
this
.
_mouseleaveHandler
,
this
));
.
on
(
'
mouseleave
'
,
'
.hovercardable
'
,
_
.
bind
(
this
.
_mouseleaveHandler
,
this
));
this
.
show
_m
e
=
false
;
this
.
show
M
e
=
false
;
this
.
parent
=
null
;
// current 'hovercardable' element that caused HC to appear
this
.
parent
=
null
;
// current 'hovercardable' element that caused HC to appear
// cache some element references
// cache some element references
...
@@ -54,19 +54,19 @@ app.views.Hovercard = app.views.Base.extend({
...
@@ -54,19 +54,19 @@ app.views.Hovercard = app.views.Base.extend({
return
false
;
return
false
;
}
}
this
.
show
_m
e
=
true
;
this
.
show
M
e
=
true
;
this
.
showHovercardOn
(
el
);
this
.
showHovercardOn
(
el
);
return
false
;
return
false
;
},
},
_mouseleaveHandler
:
function
(
event
)
{
_mouseleaveHandler
:
function
(
event
)
{
this
.
showMe
=
false
;
if
(
this
.
active
===
false
||
if
(
this
.
active
===
false
||
$
.
contains
(
this
.
el
,
event
.
relatedTarget
)
)
{
return
false
;
}
$
.
contains
(
this
.
el
,
event
.
relatedTarget
)
)
{
return
false
;
}
if
(
this
.
mouseIsOverElement
(
this
.
parent
,
event
)
||
if
(
this
.
mouseIsOverElement
(
this
.
parent
,
event
)
||
this
.
mouseIsOverElement
(
this
.
$el
,
event
)
)
{
return
false
;
}
this
.
mouseIsOverElement
(
this
.
$el
,
event
)
)
{
return
false
;
}
this
.
show_me
=
false
;
if
(
this
.
$el
.
is
(
'
:visible
'
)
)
{
if
(
this
.
$el
.
is
(
'
:visible
'
)
)
{
this
.
$el
.
fadeOut
(
'
fast
'
);
this
.
$el
.
fadeOut
(
'
fast
'
);
}
else
{
}
else
{
...
@@ -81,7 +81,7 @@ app.views.Hovercard = app.views.Base.extend({
...
@@ -81,7 +81,7 @@ app.views.Hovercard = app.views.Base.extend({
var
el
=
$
(
element
);
var
el
=
$
(
element
);
var
hc
=
this
.
$el
;
var
hc
=
this
.
$el
;
if
(
!
this
.
show
_m
e
)
{
if
(
!
this
.
show
M
e
)
{
// mouse has left element
// mouse has left element
return
;
return
;
}
}
...
@@ -103,6 +103,10 @@ app.views.Hovercard = app.views.Base.extend({
...
@@ -103,6 +103,10 @@ app.views.Hovercard = app.views.Base.extend({
}
}
self
.
_populateHovercardWith
(
person
);
self
.
_populateHovercardWith
(
person
);
if
(
!
self
.
showMe
)
{
// mouse has left element
return
;
}
self
.
$el
.
fadeIn
(
'
fast
'
);
self
.
$el
.
fadeIn
(
'
fast
'
);
});
});
},
},
...
@@ -141,13 +145,13 @@ app.views.Hovercard = app.views.Base.extend({
...
@@ -141,13 +145,13 @@ app.views.Hovercard = app.views.Base.extend({
left
:
p_pos
.
left
left
:
p_pos
.
left
});
});
},
},
mouseIsOverElement
:
function
(
element
,
event
)
{
mouseIsOverElement
:
function
(
element
,
event
)
{
var
el
_p
os
=
element
.
offset
();
var
el
P
os
=
element
.
offset
();
return
event
.
pageX
>=
el
_p
os
.
left
&&
return
event
.
pageX
>=
el
P
os
.
left
&&
event
.
pageX
<=
el
_p
os
.
left
+
element
.
width
()
&&
event
.
pageX
<=
el
P
os
.
left
+
element
.
width
()
&&
event
.
pageY
>=
el
_p
os
.
top
&&
event
.
pageY
>=
el
P
os
.
top
&&
event
.
pageY
<=
el
_p
os
.
top
+
element
.
height
();
event
.
pageY
<=
el
P
os
.
top
+
element
.
height
();
},
},
});
});
// @license-end
// @license-end
Ce diff est replié.
Cliquez pour l'agrandir.
Aperçu
0%
Chargement en cours
Veuillez réessayer
ou
joindre un nouveau fichier
.
Annuler
You are about to add
0
people
to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Enregistrer le commentaire
Annuler
Veuillez vous
inscrire
ou vous
se connecter
pour commenter