tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
  Applied the changes there.
This commit is contained in:
Claire
2023-08-24 21:01:19 +02:00
parent 1b5d3fdc5e 1cdcd9dc08
commit fbfc4145fd
8 changed files with 369 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/javascript/core/settings.js
View File

@@ -18,22 +18,14 @@ delegate(document, '#account_display_name', 'input', ({ target }) => {
}
});
delegate(document, '#account_avatar', 'change', ({ target }) => {
const avatar = document.querySelector('.card .avatar img');
delegate(document, '#edit_profile input[type=file]', 'change', ({ target }) => {
const avatar = document.getElementById(target.id + '-preview');
const [file] = target.files || [];
const url = file ? URL.createObjectURL(file) : avatar.dataset.originalSrc;
avatar.src = url;
});
delegate(document, '#account_header', 'change', ({ target }) => {
const header = document.querySelector('.card .card__img img');
const [file] = target.files || [];
const url = file ? URL.createObjectURL(file) : header.dataset.originalSrc;
header.src = url;
});
delegate(document, '#account_locked', 'change', ({ target }) => {
const lock = document.querySelector('.card .display-name i');

10
app/javascript/styles/mastodon/forms.scss
View File

@@ -309,9 +309,19 @@ code {
border-radius: 4px;
background: url('images/void.png');
&[src$='missing.png'] {
visibility: hidden;
}
&:last-child {
margin-bottom: 0;
}
&#account_avatar-preview {
width: 90px;
height: 90px;
object-fit: cover;
}
}
}