Merge that good fresh upstream shit

2017-07-22 01:16:53 +00:00
parent 0244019ca1 8d6c3cd48a
commit 984d2d4cb6
21 changed files with 253 additions and 23 deletions
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -90,6 +90,20 @@ function main() {
      noteCounter.textContent = 500 - length(noteWithoutMetadata);
    }
  });
+
+  delegate(document, '#account_avatar', 'change', ({ target }) => {
+    const avatar = document.querySelector('.card.compact .avatar img');
+    const [file] = target.files || [];
+    const url = URL.createObjectURL(file);
+    avatar.src = url;
+  });
+
+  delegate(document, '#account_header', 'change', ({ target }) => {
+    const header = document.querySelector('.card.compact');
+    const [file] = target.files || [];
+    const url = URL.createObjectURL(file);
+    header.style.backgroundImage = `url(${url})`;
+  });
 }

 loadPolyfills().then(main).catch(error => {