Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Milan
diaspora
Commits
b58226ba
Commit
b58226ba
authored
Jan 09, 2017
by
Steffen van Bergerem
Committed by
Benjamin Neff
Jan 11, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Load comments in mobile view when clicking comment button
closes #7207
parent
c9d49c89
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
Changelog.md
Changelog.md
+1
-0
app/assets/javascripts/mobile/mobile_comments.js
app/assets/javascripts/mobile/mobile_comments.js
+12
-1
No files found.
Changelog.md
View file @
b58226ba
...
...
@@ -3,6 +3,7 @@
## Refactor
*
Increase the spacing above and below post contents
[
#7267
](
https://github.com/diaspora/diaspora/pull/7267
)
*
Replace fileuploader-custom with FineUploader
[
#7083
](
https://github.com/diaspora/diaspora/pull/7083
)
*
Always show mobile reaction counts
[
#7207
](
https://github.com/diaspora/diaspora/pull/7207
)
## Bug fixes
*
Fix background color of year on notifications page with dark theme
[
#7263
](
https://github.com/diaspora/diaspora/pull/7263
)
...
...
app/assets/javascripts/mobile/mobile_comments.js
View file @
b58226ba
...
...
@@ -18,8 +18,19 @@
this
.
stream
().
on
(
"
tap click
"
,
"
a.comment-action
"
,
function
(
evt
)
{
evt
.
preventDefault
();
self
.
showCommentBox
(
$
(
this
));
var
bottomBar
=
$
(
this
).
closest
(
"
.bottom-bar
"
).
first
();
var
toggleReactionsLink
=
bottomBar
.
find
(
"
a.show-comments
"
).
first
();
if
(
toggleReactionsLink
.
length
===
0
)
{
self
.
showCommentBox
(
$
(
this
));
}
else
{
if
(
toggleReactionsLink
.
hasClass
(
"
loading
"
))
{
return
;
}
if
(
!
toggleReactionsLink
.
hasClass
(
"
active
"
))
{
self
.
showComments
(
toggleReactionsLink
);
}
}
var
commentContainer
=
bottomBar
.
find
(
"
.comment-container
"
).
first
();
self
.
scrollToOffset
(
commentContainer
);
});
...
...
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