diff --git a/public/javascripts/aspects-dropdown.js b/public/javascripts/aspects-dropdown.js index 5aed7eeb9c5ef0adf5ffbaecb4797548829db6e5..4bd65eb2fed2c8a6f3b40610ee04959e8cda643e 100644 --- a/public/javascripts/aspects-dropdown.js +++ b/public/javascripts/aspects-dropdown.js @@ -27,7 +27,7 @@ var AspectsDropdown = { toggleCheckbox: function(check){ - check.parent('li').toggleClass('selected'); + check.toggleClass('selected'); }, }; diff --git a/public/javascripts/contact-edit.js b/public/javascripts/contact-edit.js index 9480257aabcd156c1b0aeeb71d50ecb13a399aaa..cb4a1d7ace0aaae5529829208972435933c395ba 100644 --- a/public/javascripts/contact-edit.js +++ b/public/javascripts/contact-edit.js @@ -35,8 +35,7 @@ var ContactEdit = { var button = li.find('.button'); if(button.hasClass('disabled') || li.hasClass('newItem')){ return; } - var checkbox = li.find('img.check'), - selected = li.hasClass("selected"), + var selected = li.hasClass("selected"), routedId = selected ? "/42" : ""; $.post("/aspect_memberships" + routedId + ".json", { @@ -45,7 +44,7 @@ var ContactEdit = { "_method": (selected) ? "DELETE" : "POST" }, function(aspectMembership) { li.removeClass('loading') - ContactEdit.toggleCheckbox(checkbox); + ContactEdit.toggleCheckbox(li); ContactEdit.updateNumber(li.closest(".dropdown_list"), li.parent().data("person_id"), aspectMembership.aspect_ids.length, 'in_aspect'); Diaspora.widgets.publish("aspectDropdown/updated", [li.parent().data("person_id"), li.parents(".dropdown").parent(".right").html()]); }); diff --git a/public/javascripts/publisher.js b/public/javascripts/publisher.js index d3265c2eca6efbf110352c47c24dba8283b14bff..33b51dd6bcb2376609d1fb8390a57bef47049495 100644 --- a/public/javascripts/publisher.js +++ b/public/javascripts/publisher.js @@ -347,11 +347,9 @@ var Publisher = { bindAspectToggles: function() { $('#publisher .dropdown .dropdown_list li').bind("click", function(evt){ var li = $(this), - button = li.find('.button'), - checkbox = li.find('img.check'); - if(button.hasClass('disabled')) { return; } + button = li.parent('.dropdown').find('.button'); - AspectsDropdown.toggleCheckbox(checkbox); + AspectsDropdown.toggleCheckbox(li); AspectsDropdown.updateNumber(li.closest(".dropdown_list"), null, li.parent().find('li.selected').length, ''); Publisher.toggleAspectIds(li.attr('data-aspect_id')); @@ -376,7 +374,7 @@ var Publisher = { } }, onSuccess: function(data, json, xhr){ - var isPostVisible = false; + var isPostVisible = AspectFilters.selectedGUIDS.length == 0; var postedTo = Publisher.selectedAspectIds(); $.each(AspectFilters.selectedGUIDS, function(index, value){ if(postedTo.indexOf(parseInt(value))>-1)