Skip to content
Extraits de code Groupes Projets
Valider 2c47262d rédigé par Ilyaaaaaaaaaaaaa Zhitomirskiy's avatar Ilyaaaaaaaaaaaaa Zhitomirskiy
Parcourir les fichiers

manually pulled in manuels latest commits

parent c3bcb9c9
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -27,7 +27,7 @@ var AspectsDropdown = { ...@@ -27,7 +27,7 @@ var AspectsDropdown = {
toggleCheckbox: toggleCheckbox:
function(check){ function(check){
check.parent('li').toggleClass('selected'); check.toggleClass('selected');
}, },
}; };
...@@ -35,8 +35,7 @@ var ContactEdit = { ...@@ -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 = { ...@@ -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()]);
}); });
......
...@@ -347,11 +347,9 @@ var Publisher = { ...@@ -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 = { ...@@ -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)
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter