Commit ef6c8a54 authored by Anton Tkachov's avatar Anton Tkachov Committed by Steffen van Bergerem
Browse files

Issue #6180: Update stream faces block if somebody was blocked 

closes #6320
parent 663835ed

Changelog.md

+1 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ 
* Implement NodeInfo [#6239](https://github.com/diaspora/diaspora/pull/6239)

* Implement NodeInfo [#6239](https://github.com/diaspora/diaspora/pull/6239)

* Display original author on reshares of NSFW posts [#6270](https://github.com/diaspora/diaspora/pull/6270)

* Display original author on reshares of NSFW posts [#6270](https://github.com/diaspora/diaspora/pull/6270)

* Use avatars in hovercards as links to the profile [#6297](https://github.com/diaspora/diaspora/pull/6297)

* Use avatars in hovercards as links to the profile [#6297](https://github.com/diaspora/diaspora/pull/6297)

* Remove avatars of ignored users from stream faces [#6320](https://github.com/diaspora/diaspora/pull/6320)





# 0.5.2.0

# 0.5.2.0

app/assets/javascripts/app/models/stream.js

+4 −0
Original line number Original line Diff line number Diff line
@@ -83,6 +83,10 @@ app.models.Stream = Backbone.Collection.extend({ 
    this.trigger("fetched");

    this.trigger("fetched");

  },

  },





  remove : function(models) {

    this.items.remove(models);

  },



  preloadOrFetch : function(){ //hai, plz test me THNX

  preloadOrFetch : function(){ //hai, plz test me THNX

    return $.when(app.hasPreload("stream") ? this.preload() : this.fetch());

    return $.when(app.hasPreload("stream") ? this.preload() : this.fetch());

  },

  },

app/assets/javascripts/app/views/stream_faces_view.js

+1 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ app.views.StreamFaces = app.views.Base.extend({ 
  initialize : function(){

  initialize : function(){

    this.updatePeople();

    this.updatePeople();

    app.stream.items.bind("add", this.updatePeople, this);

    app.stream.items.bind("add", this.updatePeople, this);

    app.stream.items.bind("remove", this.updatePeople, this);

  },

  },





  presenter : function() {

  presenter : function() {

app/assets/javascripts/app/views/stream_post_views.js

+1 −0
Original line number Original line Diff line number Diff line
@@ -91,6 +91,7 @@ app.views.StreamPost = app.views.Post.extend({ 




  remove : function() {

  remove : function() {

    $(this.el).slideUp(400, _.bind(function(){this.$el.remove()}, this));

    $(this.el).slideUp(400, _.bind(function(){this.$el.remove()}, this));

    app.stream.remove(this.model);

    return this;

    return this;

  },

  },

spec/javascripts/app/views/stream_faces_view_spec.js

+5 −1
Original line number Original line Diff line number Diff line
@@ -21,11 +21,15 @@ describe("app.views.StreamFaces", function(){ 
    expect(this.view.people.length).toBe(5);

    expect(this.view.people.length).toBe(5);

  });

  });





  it("findsPeople when the collection changes", function(){

  it("Finds people that were added to the collection", function() {

    this.posts.add(factory.post({author : factory.author({name : "Harriet Tubman"})}));

    this.posts.add(factory.post({author : factory.author({name : "Harriet Tubman"})}));

    expect(this.view.people.length).toBe(6);

    expect(this.view.people.length).toBe(6);

  });

  });





  it("Finds people that were removed from the collection", function() {

    this.posts.remove([this.post2, this.post3]);

    expect(this.view.people.length).toBe(3);

  });





  describe(".render", function(){

  describe(".render", function(){

    beforeEach(function(){

    beforeEach(function(){