From 0bfabed2d508c09abec54c14bd771b4625a522ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 22 Jun 2015 16:22:15 +0200 Subject: [PATCH] FIX: avatar selection wasn't properly pre-selected --- .../discourse/views/avatar-selector.js.es6 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/views/avatar-selector.js.es6 b/app/assets/javascripts/discourse/views/avatar-selector.js.es6 index ed60610505..15b8541ef3 100644 --- a/app/assets/javascripts/discourse/views/avatar-selector.js.es6 +++ b/app/assets/javascripts/discourse/views/avatar-selector.js.es6 @@ -5,9 +5,12 @@ export default ModalBodyView.extend({ classNames: ['avatar-selector'], title: I18n.t('user.change_avatar.title'), - // *HACK* used to select the proper radio button, cause {{action}} - // stops the default behavior + // *HACK* used to select the proper radio button, because {{action}} stops the default behavior selectedChanged: function() { - Em.run.next(() => $('input:radio[name="avatar"]').val([this.get('controller.selected')]) ); - }.observes('controller.selected') + Em.run.next(() => $('input:radio[name="avatar"]').val([this.get('controller.selected')])); + }.observes('controller.selected').on("didInsertElement"), + + _focusSelectedButton: function() { + Em.run.next(() => $('input:radio[value="' + this.get('controller.selected') + '"]').focus()); + }.on("didInsertElement") });