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

Merge pull request #5119 from svbergerem/people-search-fix-aspect-membership

Browse source 
Fix aspect membership dropdown on people search page
This commit is contained in:
Jonne Haß 2014-08-15 03:22:54 +02:00
commit 691594e0fd
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/app/app.js
View file

@ -100,6 +100,9 @@ var app = {
setupGlobalViews: function() {
app.hovercard = new app.views.Hovercard();
app.aspectMembershipsBlueprint = new app.views.AspectMembershipBlueprint();
$('.aspect_membership_dropdown').each(function(){
new app.views.AspectMembership({el: this});
});
app.sidebar = new app.views.Sidebar();
},

3
app/assets/javascripts/app/views/notifications_view.js
View file

@ -6,9 +6,6 @@ app.views.Notifications = Backbone.View.extend({
initialize: function() {
Diaspora.page.header.notifications.setUpNotificationPage(this);
$('.aspect_membership_dropdown').each(function(){
new app.views.AspectMembership({el: this});
});
},
toggleUnread: function(evt) {

22
app/assets/javascripts/people.js
View file

@ -11,16 +11,16 @@ $(document).ready(function() {
$('#profile_buttons .sharing_message_container').tooltip({placement: 'bottom'});
$("#block_user_button").click(function(evt) {
if(!confirm(Diaspora.I18n.t('ignore_user'))) { return; }
var personId = $(this).data('person-id');
var block = new app.models.Block();
block.save({block : {person_id : personId}}, {
success: function() {
$('#profile_buttons').attr('class', 'blocked');
$('#sharing_message').attr('class', 'icons-circle');
$('.profile_button, .white_bar').remove();
}
});
var personId = $(this).data('person-id');
var block = new app.models.Block();
block.save({block : {person_id : personId}}, {
success: function() {
$('#profile_buttons').attr('class', 'blocked');
$('#sharing_message').attr('class', 'icons-circle');
$('.profile_button, .white_bar').remove();
}
});
return false;
});
return false;
});
});