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

manually pulled in manuels latest commits

Browse source
This commit is contained in:
Ilyaaaaaaaaaaaaa Zhitomirskiy 2011-08-18 16:44:53 -07:00
parent c3bcb9c962
commit 2c47262d54
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/javascripts/aspects-dropdown.js
View file

@ -27,7 +27,7 @@ var AspectsDropdown = {
toggleCheckbox: toggleCheckbox:
function(check){ function(check){
check.parent('li').toggleClass('selected'); check.toggleClass('selected');
}, },
}; };

5
public/javascripts/contact-edit.js
View file

@ -35,8 +35,7 @@ var ContactEdit = {
var button = li.find('.button'); var button = li.find('.button');
if(button.hasClass('disabled') || li.hasClass('newItem')){ return; } if(button.hasClass('disabled') || li.hasClass('newItem')){ return; }
var checkbox = li.find('img.check'), var selected = li.hasClass("selected"),
selected = li.hasClass("selected"),
routedId = selected ? "/42" : ""; routedId = selected ? "/42" : "";
$.post("/aspect_memberships" + routedId + ".json", { $.post("/aspect_memberships" + routedId + ".json", {
@ -45,7 +44,7 @@ var ContactEdit = {
"_method": (selected) ? "DELETE" : "POST" "_method": (selected) ? "DELETE" : "POST"
}, function(aspectMembership) { }, function(aspectMembership) {
li.removeClass('loading') 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'); 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()]); Diaspora.widgets.publish("aspectDropdown/updated", [li.parent().data("person_id"), li.parents(".dropdown").parent(".right").html()]);
}); });

8
public/javascripts/publisher.js
View file

@ -347,11 +347,9 @@ var Publisher = {
bindAspectToggles: function() { bindAspectToggles: function() {
$('#publisher .dropdown .dropdown_list li').bind("click", function(evt){ $('#publisher .dropdown .dropdown_list li').bind("click", function(evt){
var li = $(this), var li = $(this),
button = li.find('.button'), button = li.parent('.dropdown').find('.button');
checkbox = li.find('img.check');
if(button.hasClass('disabled')) { return; }
AspectsDropdown.toggleCheckbox(checkbox); AspectsDropdown.toggleCheckbox(li);
AspectsDropdown.updateNumber(li.closest(".dropdown_list"), null, li.parent().find('li.selected').length, ''); AspectsDropdown.updateNumber(li.closest(".dropdown_list"), null, li.parent().find('li.selected').length, '');
Publisher.toggleAspectIds(li.attr('data-aspect_id')); Publisher.toggleAspectIds(li.attr('data-aspect_id'));
@ -376,7 +374,7 @@ var Publisher = {
} }
}, },
onSuccess: function(data, json, xhr){ onSuccess: function(data, json, xhr){
var isPostVisible = false; var isPostVisible = AspectFilters.selectedGUIDS.length == 0;
var postedTo = Publisher.selectedAspectIds(); var postedTo = Publisher.selectedAspectIds();
$.each(AspectFilters.selectedGUIDS, function(index, value){ $.each(AspectFilters.selectedGUIDS, function(index, value){
if(postedTo.indexOf(parseInt(value))>-1) if(postedTo.indexOf(parseInt(value))>-1)