Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
diaspora
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Gigadoc 2
diaspora
Commits
ef6c8a54
Commit
ef6c8a54
authored
Aug 15, 2015
by
Anton Tkachov
Committed by
Steffen van Bergerem
Aug 22, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #6180: Update stream faces block if somebody was blocked
closes #6320
parent
663835ed
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
1 deletion
+12
-1
Changelog.md
Changelog.md
+1
-0
app/assets/javascripts/app/models/stream.js
app/assets/javascripts/app/models/stream.js
+4
-0
app/assets/javascripts/app/views/stream_faces_view.js
app/assets/javascripts/app/views/stream_faces_view.js
+1
-0
app/assets/javascripts/app/views/stream_post_views.js
app/assets/javascripts/app/views/stream_post_views.js
+1
-0
spec/javascripts/app/views/stream_faces_view_spec.js
spec/javascripts/app/views/stream_faces_view_spec.js
+5
-1
No files found.
Changelog.md
View file @
ef6c8a54
...
...
@@ -23,6 +23,7 @@
*
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
)
*
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
...
...
app/assets/javascripts/app/models/stream.js
View file @
ef6c8a54
...
...
@@ -83,6 +83,10 @@ app.models.Stream = Backbone.Collection.extend({
this
.
trigger
(
"
fetched
"
);
},
remove
:
function
(
models
)
{
this
.
items
.
remove
(
models
);
},
preloadOrFetch
:
function
(){
//hai, plz test me THNX
return
$
.
when
(
app
.
hasPreload
(
"
stream
"
)
?
this
.
preload
()
:
this
.
fetch
());
},
...
...
app/assets/javascripts/app/views/stream_faces_view.js
View file @
ef6c8a54
...
...
@@ -11,6 +11,7 @@ app.views.StreamFaces = app.views.Base.extend({
initialize
:
function
(){
this
.
updatePeople
();
app
.
stream
.
items
.
bind
(
"
add
"
,
this
.
updatePeople
,
this
);
app
.
stream
.
items
.
bind
(
"
remove
"
,
this
.
updatePeople
,
this
);
},
presenter
:
function
()
{
...
...
app/assets/javascripts/app/views/stream_post_views.js
View file @
ef6c8a54
...
...
@@ -91,6 +91,7 @@ app.views.StreamPost = app.views.Post.extend({
remove
:
function
()
{
$
(
this
.
el
).
slideUp
(
400
,
_
.
bind
(
function
(){
this
.
$el
.
remove
()},
this
));
app
.
stream
.
remove
(
this
.
model
);
return
this
;
},
...
...
spec/javascripts/app/views/stream_faces_view_spec.js
View file @
ef6c8a54
...
...
@@ -21,11 +21,15 @@ describe("app.views.StreamFaces", function(){
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
"
})}));
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
(){
beforeEach
(
function
(){
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment