Aspect dropdowns read 'All Aspects' if all aspects are selected
This commit is contained in:
parent
aa1aaaa0d8
commit
66836e53d2
3 changed files with 8 additions and 1 deletions
|
|
@ -4,7 +4,9 @@
|
|||
|
||||
.dropdown{:class => ["hang_#{hang}", defined?(dropdown_class) && dropdown_class]}
|
||||
.button.toggle{:class => ("in_aspects" if selected_aspects.size > 0)}
|
||||
- if selected_aspects.size == 1
|
||||
- if selected_aspects.size == all_aspects.size
|
||||
= t('all_aspects')
|
||||
- elsif selected_aspects.size == 1
|
||||
= selected_aspects.first.name
|
||||
- else
|
||||
= t('.toggle', :count => selected_aspects.size)
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ en:
|
|||
disconnected: "The websocket is closed; posts will no longer be streamed live."
|
||||
aspect_dropdown:
|
||||
add_to_aspect: "Add to aspect"
|
||||
all_aspects: "All aspects"
|
||||
toggle:
|
||||
zero: "Add to aspect"
|
||||
one: "In {{count}} aspect"
|
||||
|
|
|
|||
|
|
@ -5,11 +5,15 @@
|
|||
var AspectsDropdown = {
|
||||
updateNumber: function(dropdown, personId, number, inAspectClass){
|
||||
var button = dropdown.parents(".dropdown").children('.button.toggle'),
|
||||
selectedAspects = dropdown.children(".selected").length,
|
||||
allAspects = dropdown.children().length,
|
||||
replacement;
|
||||
|
||||
if (number == 0) {
|
||||
button.removeClass(inAspectClass);
|
||||
replacement = Diaspora.I18n.t("aspect_dropdown.toggle.zero");
|
||||
}else if (selectedAspects == allAspects) {
|
||||
replacement = Diaspora.I18n.t('aspect_dropdown.all_aspects');
|
||||
}else if (number == 1) {
|
||||
button.addClass(inAspectClass);
|
||||
replacement = dropdown.find(".selected").first().text();
|
||||
|
|
|
|||
Loading…
Reference in a new issue