From ef9e764f7a39948941599e54a46995ffb7bf1f70 Mon Sep 17 00:00:00 2001 From: Gayathrir1666 Date: Sun, 15 Apr 2018 18:51:25 +0530 Subject: [PATCH] Add scrollbar to aspect dropdowns closes #8213 closes #7696 Co-authored-by: Hank Grabowski Co-authored-by: Thorsten Claus --- Changelog.md | 1 + app/assets/javascripts/app/views/aspect_membership_view.js | 6 ++---- app/assets/stylesheets/aspects.scss | 4 ++++ app/assets/templates/aspect_membership_dropdown_tpl.jst.hbs | 2 +- app/assets/templates/aspects-list_tpl.jst.hbs | 2 +- app/views/aspects/_aspect_dropdown.html.haml | 2 +- spec/controllers/notifications_controller_spec.rb | 2 +- spec/javascripts/app/pages/getting_started_spec.js | 2 +- 8 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Changelog.md b/Changelog.md index 9ebebc86c..35d415d8e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -11,6 +11,7 @@ * Bump mimemagic [#8231](https://github.com/diaspora/diaspora/pull/8231) * Removed support for defunct Uni Heidelberg OSM tile server, Mapbox is now required if you want to show maps [#8215](https://github.com/diaspora/diaspora/pull/8215) * Render only two fractional digits in the posts per user/day admin statistics [#8227](https://github.com/diaspora/diaspora/pull/8227) +* Make aspect dropdowns scrollable [#8213](https://github.com/diaspora/diaspora/pull/8213) ## Features * Support and recommend TOML as configuration format [#8132](https://github.com/diaspora/diaspora/pull/8132) diff --git a/app/assets/javascripts/app/views/aspect_membership_view.js b/app/assets/javascripts/app/views/aspect_membership_view.js index 2b46c2ed7..328507d81 100644 --- a/app/assets/javascripts/app/views/aspect_membership_view.js +++ b/app/assets/javascripts/app/views/aspect_membership_view.js @@ -16,10 +16,8 @@ app.views.AspectMembership = app.views.Base.extend({ }, events: { - "click ul.aspect_membership.dropdown-menu > li.aspect_selector" - : "_clickHandler", - "keypress ul.aspect_membership.dropdown-menu > li.aspect_selector" - : "_clickHandler" + "click ul.aspect-membership.dropdown-menu > li.aspect_selector": "_clickHandler", + "keypress ul.aspect-membership.dropdown-menu > li.aspect_selector": "_clickHandler" }, initialize: function(opts) { diff --git a/app/assets/stylesheets/aspects.scss b/app/assets/stylesheets/aspects.scss index 2fcb3edd7..dce9a065d 100644 --- a/app/assets/stylesheets/aspects.scss +++ b/app/assets/stylesheets/aspects.scss @@ -21,3 +21,7 @@ } } } +.aspect-membership { + max-height: 300px; + overflow: auto; +} diff --git a/app/assets/templates/aspect_membership_dropdown_tpl.jst.hbs b/app/assets/templates/aspect_membership_dropdown_tpl.jst.hbs index d77f8ed49..03e24c939 100644 --- a/app/assets/templates/aspect_membership_dropdown_tpl.jst.hbs +++ b/app/assets/templates/aspect_membership_dropdown_tpl.jst.hbs @@ -13,7 +13,7 @@ -
    +
      {{#each aspects}}
    • - + {{ t "aspect_navigation.select_all" }}
      • diff --git a/app/views/aspects/_aspect_dropdown.html.haml b/app/views/aspects/_aspect_dropdown.html.haml index 04c9ecf96..8215c3b82 100644 --- a/app/views/aspects/_aspect_dropdown.html.haml +++ b/app/views/aspects/_aspect_dropdown.html.haml @@ -22,7 +22,7 @@ - else = t("shared.aspect_dropdown.toggle", count: selected_aspects.size) %span.caret - %ul.dropdown-menu.pull-right{unSelectable: "on"} + %ul.dropdown-menu.aspect-membership.pull-right{unSelectable: "on"} %li.public.radio{"data-aspect_id" => "public", :class => ("selected" if public_selected?(selected_aspects))} %a diff --git a/spec/controllers/notifications_controller_spec.rb b/spec/controllers/notifications_controller_spec.rb index 19c940481..a7113d393 100644 --- a/spec/controllers/notifications_controller_spec.rb +++ b/spec/controllers/notifications_controller_spec.rb @@ -115,7 +115,7 @@ describe NotificationsController, :type => :controller do it "should not provide a contacts menu for standard notifications" do FactoryGirl.create(:notification, :recipient => alice, :target => @post) get :index, params: {per_page: 5} - expect(Nokogiri(response.body).css('.aspect_membership')).to be_empty + expect(Nokogiri(response.body).css(".aspect-membership")).to be_empty end it "should provide a contacts menu for start sharing notifications" do diff --git a/spec/javascripts/app/pages/getting_started_spec.js b/spec/javascripts/app/pages/getting_started_spec.js index 35e7f5aa4..58dd3d191 100644 --- a/spec/javascripts/app/pages/getting_started_spec.js +++ b/spec/javascripts/app/pages/getting_started_spec.js @@ -10,6 +10,6 @@ describe("app.pages.GettingStarted", function() { it("renders aspect membership dropdown", function() { this.view.render(); - expect($("ul.dropdown-menu.aspect_membership").length).toEqual(1); + expect($("ul.dropdown-menu.aspect-membership").length).toEqual(1); }); });