nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4127 from marpo60/fix_aspects_max_selection

Browse source 
Fix select & deselect all aspects check image
This commit is contained in:
Jonne Haß 2013-04-22 08:34:13 -07:00
commit 25b3f6bcdc
4 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -109,6 +109,7 @@ everything is set up.
## Bug fixes
* fix mass aspect selection [#4127](https://github.com/diaspora/diaspora/pull/4127)
* Fix posting functionality on tags show view [#4112](https://github.com/diaspora/diaspora/pull/4112)
* Fix cancel button on getting_started confirmation box [#4073](https://github.com/diaspora/diaspora/issues/4073)
* Reset comment box height after posting a comment. [#4030](https://github.com/diaspora/diaspora/issues/4030)

11
app/assets/javascripts/app/views/aspects_list_view.js
View file

@ -28,12 +28,19 @@ app.views.AspectsList = app.views.Base.extend({
toggleAll: function(evt){
if (evt) { evt.preventDefault(); };
var aspects = this.$('li:not(:last)')
if (this.collection.allSelected()) {
this.collection.deselectAll();
this.$('li:not(:last)').removeClass("active");
aspects.removeClass("active");
aspects.each(function(i){
$(this).find('.icons-check_yes_ok').addClass('invisible');
});
} else {
this.collection.selectAll();
this.$('li:not(:last)').addClass("active");
aspects.addClass("active");
aspects.each(function(i){
$(this).find('.icons-check_yes_ok').removeClass('invisible');
});
}
this.toggleSelector();

7
features/aspect_navigation.feature
View file

@ -31,3 +31,10 @@ Feature: Aspect navigation on the left menu
Then I should see "Besties" aspect selected
Then I should see "Unicorns" aspect selected
Then I should see "Others" aspect unselected
Scenario: Deselect all aspects
When I go to the aspects page
And I follow "Deselect all"
Then I should see "Besties" aspect unselected
Then I should see "Unicorns" aspect unselected
Then I should see "Others" aspect unselected

3
features/step_definitions/aspects_steps.rb
View file

@ -38,12 +38,13 @@ When /^I should see "([^"]*)" aspect selected$/ do |aspect_name|
aspect = @me.aspects.where(:name => aspect_name).first
within("#aspect_nav") do
page.has_css?("li.active[data-aspect_id='#{aspect.id}']").should be_true
page.has_no_css?("li.active[data-aspect_id='#{aspect.id}'] .invisible").should be_true
end
end
When /^I should see "([^"]*)" aspect unselected$/ do |aspect_name|
aspect = @me.aspects.where(:name => aspect_name).first
within("#aspect_nav") do
page.has_css?("li[data-aspect_id='#{aspect.id}']:not(.active)").should be_true
page.has_css?("li[data-aspect_id='#{aspect.id}']:not(.active) .invisible").should be_true
end
end