diff options
| author | unarist <m.unarist@gmail.com> | 2017-09-11 23:19:54 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-11 16:19:54 +0200 |
| commit | 47d48fed8d398a1d1ebae01fcded0eb9f4f73c42 (patch) | |
| tree | 3be6a4a79221c135ad569e6ad965b90bb6f756e9 | |
| parent | 3018043fc2b405e42070b49e965bc7a0a38ecf2a (diff) | |
Reset preview image if avatar/header image selection was cancelled (#4893)
| -rw-r--r-- | app/javascript/packs/public.js | 4 | ||||
| -rw-r--r-- | app/views/settings/profiles/show.html.haml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js index 1a274c4cb..ca6f9eac6 100644 --- a/app/javascript/packs/public.js +++ b/app/javascript/packs/public.js @@ -124,7 +124,7 @@ function main() { delegate(document, '#account_avatar', 'change', ({ target }) => { const avatar = document.querySelector('.card.compact .avatar img'); const [file] = target.files || []; - const url = URL.createObjectURL(file); + const url = file ? URL.createObjectURL(file) : avatar.dataset.originalSrc; avatar.src = url; }); @@ -132,7 +132,7 @@ function main() { delegate(document, '#account_header', 'change', ({ target }) => { const header = document.querySelector('.card.compact'); const [file] = target.files || []; - const url = URL.createObjectURL(file); + const url = file ? URL.createObjectURL(file) : header.dataset.originalSrc; header.style.backgroundImage = `url(${url})`; }); diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index e0fb613f8..7a06cd014 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -8,8 +8,8 @@ = f.input :display_name, placeholder: t('simple_form.labels.defaults.display_name'), hint: t('simple_form.hints.defaults.display_name', count: 30 - @account.display_name.size).html_safe = f.input :note, placeholder: t('simple_form.labels.defaults.note'), hint: t('simple_form.hints.defaults.note', count: 160 - @account.note.size).html_safe - .card.compact{ style: "background-image: url(#{@account.header.url(:original)})" } - .avatar= image_tag @account.avatar.url(:original) + .card.compact{ style: "background-image: url(#{@account.header.url(:original)})", data: { original_src: @account.header.url(:original) } } + .avatar= image_tag @account.avatar.url(:original), data: { original_src: @account.avatar.url(:original) } .fields-group = f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar') |