Merge branch 'master' into 11-10-stable

1 files changed, 16 insertions, 0 deletions

diff --git a/app/assets/javascripts/avatar_picker.js b/app/assets/javascripts/avatar_picker.js
new file mode 100644
index 00000000000..d38e0b4abaa
--- /dev/null
+++ b/app/assets/javascripts/avatar_picker.js
@@ -0,0 +1,16 @@
+import $ from 'jquery';
+
+export default function initAvatarPicker() {
+  $('.js-choose-avatar-button').on('click', function onClickAvatar() {
+    const form = $(this).closest('form');
+    return form.find('.js-avatar-input').click();
+  });
+
+  $('.js-avatar-input').on('change', function onChangeAvatarInput() {
+    const form = $(this).closest('form');
+    const filename = $(this)
+      .val()
+      .replace(/^.*[\\\/]/, ''); // eslint-disable-line no-useless-escape
+    return form.find('.js-avatar-filename').text(filename);
+  });
+}