diff --git a/app/assets/javascripts/app/views/aspect_membership_blueprint_view.js b/app/assets/javascripts/app/views/aspect_membership_blueprint_view.js index 5608b32c2..985dd93cc 100644 --- a/app/assets/javascripts/app/views/aspect_membership_blueprint_view.js +++ b/app/assets/javascripts/app/views/aspect_membership_blueprint_view.js @@ -12,7 +12,8 @@ app.views.AspectMembershipBlueprint = Backbone.View.extend({ var selector = '.dropdown.aspect_membership .dropdown_list > li'; $('body') .off('click', selector) - .on('click', selector, _.bind(this._clickHandler, this)); + .on('click', selector, _.bind(this._clickHandler, this)) + .on('keypress', selector, _.bind(this._clickHandler, this)); this.list_item = null; this.dropdown = null; diff --git a/app/assets/javascripts/view.js b/app/assets/javascripts/view.js index 6e7d7f9ec..f7517b114 100644 --- a/app/assets/javascripts/view.js +++ b/app/assets/javascripts/view.js @@ -21,7 +21,8 @@ var View = { /* Dropdowns */ $(document) - .on('click', this.dropdowns.selector, this.dropdowns.click); + .on('click', this.dropdowns.selector, this.dropdowns.click) + .on('keypress', this.dropdowns.selector, this.dropdowns.click); /* Avatars */ $(this.avatars.selector).error(this.avatars.fallback); diff --git a/app/helpers/aspect_global_helper.rb b/app/helpers/aspect_global_helper.rb index c525ebf9b..e9c8a2255 100644 --- a/app/helpers/aspect_global_helper.rb +++ b/app/helpers/aspect_global_helper.rb @@ -33,7 +33,7 @@ module AspectGlobalHelper klass = am_id.present? ? "selected" : "" str = < +
  • #{aspect.name}
  • LISTITEM diff --git a/app/views/aspect_memberships/_aspect_membership_dropdown_blueprint.html.haml b/app/views/aspect_memberships/_aspect_membership_dropdown_blueprint.html.haml index baed2c0c3..77fc34aba 100644 --- a/app/views/aspect_memberships/_aspect_membership_dropdown_blueprint.html.haml +++ b/app/views/aspect_memberships/_aspect_membership_dropdown_blueprint.html.haml @@ -1,5 +1,5 @@ .dropdown{:class => ["hang_#{hang}", defined?(dropdown_class) && dropdown_class]} - .button.toggle{:class => ("in_aspects" if selected_aspects.size > 0)} + .button.toggle{:class => ("in_aspects" if selected_aspects.size > 0), :tabindex => '0'} - if selected_aspects.size == all_aspects.size = t('all_aspects') - elsif selected_aspects.size == 1