aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2019-05-05 18:15:58 +0200
committerMax Kostikov <max@kostikov.co>2019-05-05 18:15:58 +0200
commit9b947c837093ec0d762c3b0e2610b17de9dba786 (patch)
treee8fab6bada4cc06932ee64fa717144c5a3262343 /view/js
parentf56371c79bb401b7f7a627daf8aa15f61f5bc95f (diff)
parent14eb4326e76bddaec8421fdaa87e0c3ac9bb76e0 (diff)
downloadvolse-hubzilla-9b947c837093ec0d762c3b0e2610b17de9dba786.tar.gz
volse-hubzilla-9b947c837093ec0d762c3b0e2610b17de9dba786.tar.bz2
volse-hubzilla-9b947c837093ec0d762c3b0e2610b17de9dba786.zip
Merge branch 'dev' into 'dev'
Threaded comments usability imrovements See merge request hubzilla/core!1633
Diffstat (limited to 'view/js')
-rw-r--r--view/js/main.js10
1 files changed, 8 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js
index 8dfb04779..5592fd63d 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1160,8 +1160,14 @@ function doreply(parent, ident, owner, hint) {
}
function doscroll(parent, hidden) {
- $('.back-to-reply').remove();
- var pos = $(window).scrollTop();
+ var back = $('.back-to-reply');
+ if(back.length == 0) {
+ var pos = Math.round($(window).scrollTop());
+ }
+ else {
+ var pos = back.attr('href').replace(/\D/g,'')
+ }
+ back.remove();
var x = '#hide-comments-outer-' + hidden.toString();
if($(x).length !== 0) {
x = $(x).attr("onclick").replace(/\D/g,'');