Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
diaspora
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Milan
diaspora
Commits
750b4b43
Commit
750b4b43
authored
14 years ago
by
danielvincent
Browse files
Options
Downloads
Patches
Plain Diff
empty message re-appears if all stream posts are deleted
parent
8daf2d0f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/views/aspects/index.html.haml
+3
-4
3 additions, 4 deletions
app/views/aspects/index.html.haml
app/views/aspects/show.html.haml
+3
-4
3 additions, 4 deletions
app/views/aspects/show.html.haml
app/views/js/_websocket_js.haml
+6
-5
6 additions, 5 deletions
app/views/js/_websocket_js.haml
with
12 additions
and
13 deletions
app/views/aspects/index.html.haml
+
3
−
4
View file @
750b4b43
...
...
@@ -12,10 +12,9 @@
-
for
post
in
@posts
=
render
type_partial
(
post
),
:post
=>
post
unless
post
.
class
==
Album
-
if
@posts
.
size
==
0
#empty_message
.null_arrow
⇧
%h3
Nobody has said anything yet. Get the conversation started!
#empty_message
{
:style
=>
(
"display:none"
unless
@posts
.
count
==
0
)}
.null_arrow
⇧
%h3
Nobody has said anything yet. Get the conversation started!
#pagination
=
will_paginate
@posts
...
...
This diff is collapsed.
Click to expand it.
app/views/aspects/show.html.haml
+
3
−
4
View file @
750b4b43
...
...
@@ -12,10 +12,9 @@
-
for
post
in
@posts
=
render
type_partial
(
post
),
:post
=>
post
unless
post
.
class
==
Album
-
if
@posts
.
size
==
0
#empty_message
.null_arrow
⇧
%h3
Nobody has said anything yet. Get the conversation started!
#empty_message
{
:style
=>
(
"display:none"
unless
@posts
.
count
==
0
)}
.null_arrow
⇧
%h3
Nobody has said anything yet. Get the conversation started!
#pagination
=
will_paginate
@posts
...
...
This diff is collapsed.
Click to expand it.
app/views/js/_websocket_js.haml
+
6
−
5
View file @
750b4b43
...
...
@@ -37,9 +37,10 @@
});
function
processRetraction
(
post_id
){
$
(
'
#
'
+
post_id
).
fadeOut
(
500
,
function
(){
$
(
this
).
remove
;
});
$
(
'
#
'
+
post_id
).
fadeOut
(
500
).
remove
();
if
(
$
(
"
#stream
"
)[
0
].
childElementCount
==
0
){
$
(
"
#empty_message
"
).
fadeIn
(
200
);
}
}
function
processComment
(
post_id
,
html
){
...
...
@@ -67,8 +68,8 @@
)
};
if
(
$
(
"
#empty_message
"
).
length
>
0
){
$
(
"
#empty_message
"
).
fadeOut
(
400
,
addPostToStream
(
html
)).
remov
e
();
if
(
$
(
"
#empty_message
"
).
is
(
"
:visible
"
)
){
$
(
"
#empty_message
"
).
fadeOut
(
400
,
addPostToStream
(
html
)).
hid
e
();
}
else
{
addPostToStream
(
html
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment