Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix avatars not using image tags in web UI (#19488)

Browse source 
Fix #19483
This commit is contained in:
Eugen Rochko 2022-10-28 00:48:45 +02:00 • committed by GitHub
parent 07cc201acc
commit 8dfe5179ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 103 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.js.snap
View file

@ -2,36 +2,38 @@
exports[`<Avatar /> Autoplay renders a animated avatar 1`] = `
<div
aria-label="alice"
className="account__avatar"
onMouseEnter={[Function]}
onMouseLeave={[Function]}
role="img"
style={
{
"backgroundImage": "url(/animated/alice.gif)",
"backgroundSize": "100px 100px",
"height": "100px",
"width": "100px",
}
}
/>
>
<img
alt="alice"
src="/animated/alice.gif"
/>
</div>
`;
exports[`<Avatar /> Still renders a still avatar 1`] = `
<div
aria-label="alice"
className="account__avatar"
onMouseEnter={[Function]}
onMouseLeave={[Function]}
role="img"
style={
{
"backgroundImage": "url(/static/alice.jpg)",
"backgroundSize": "100px 100px",
"height": "100px",
"width": "100px",
}
}
/>
>
<img
alt="alice"
src="/static/alice.jpg"
/>
</div>
`;

50
app/javascript/mastodon/components/__tests__/__snapshots__/avatar_overlay-test.js.snap
View file

@ -3,22 +3,52 @@
exports[`<AvatarOverlay renders a overlay avatar 1`] = `
<div
className="account__avatar-overlay"
style={
{
"height": 46,
"width": 46,
}
}
>
<div
className="account__avatar-overlay-base"
style={
{
"backgroundImage": "url(/static/alice.jpg)",
>
<div
className="account__avatar"
onMouseEnter={[Function]}
onMouseLeave={[Function]}
style={
{
"height": "36px",
"width": "36px",
}
}
}
/>
>
<img
alt="alice"
src="/static/alice.jpg"
/>
</div>
</div>
<div
className="account__avatar-overlay-overlay"
style={
{
"backgroundImage": "url(/static/eve.jpg)",
>
<div
className="account__avatar"
onMouseEnter={[Function]}
onMouseLeave={[Function]}
style={
{
"height": "24px",
"width": "24px",
}
}
}
/>
>
<img
alt="eve@blackhat.lair"
src="/static/eve.jpg"
/>
</div>
</div>
</div>
`;