diff options
| author | redmatrix <mike@macgirvin.com> | 2016-09-29 16:20:47 -0700 |
|---|---|---|
| committer | redmatrix <mike@macgirvin.com> | 2016-09-29 16:20:47 -0700 |
| commit | 4117ada2fd52e8189fae547887af7711e9f8af54 (patch) | |
| tree | 70a0928f97876f23a8931d7b5c88d2e38113106e /view/js/main.js | |
| parent | 3727bea29acb79f66c15b155133ef3bb98d93d49 (diff) | |
| parent | c410ffd10baccfc34b34c49b81849171ac2dcd01 (diff) | |
| download | volse-hubzilla-4117ada2fd52e8189fae547887af7711e9f8af54.tar.gz volse-hubzilla-4117ada2fd52e8189fae547887af7711e9f8af54.tar.bz2 volse-hubzilla-4117ada2fd52e8189fae547887af7711e9f8af54.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/view/js/main.js b/view/js/main.js index 65a5311af..0239fc1f8 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -652,14 +652,16 @@ function updateConvItems(mode,data) { } // auto-scroll to a particular comment in a thread (designated by mid) when in single-thread mode - if($('.item_' + bParam_mid.substring(0,32)).length && mode == 'replace') { - $('html, body').animate({ scrollTop: $('.item_' + bParam_mid.substring(0,32)).offset().top - $('nav').outerHeight(true) }, 'slow'); + if($('.item_' + bParam_mid.substring(0,32)).length && !$('.item_' + bParam_mid.substring(0,32)).hasClass('toplevel_item') && mode == 'replace') { if($('.collapsed-comments').length) { var scrolltoid = $('.collapsed-comments').attr('id').substring(19); - $('#collapsed-comments-' + scrolltoid).slideDown(); + $('#collapsed-comments-' + scrolltoid + ' .autotime').timeago(); + $('#collapsed-comments-' + scrolltoid).show(); $('#hide-comments-' + scrolltoid).html(aStr.showfewer); $('#hide-comments-total-' + scrolltoid).hide(); } + $('html, body').animate({ scrollTop: $('.item_' + bParam_mid.substring(0,32)).offset().top - $('nav').outerHeight() }, 'slow'); + $('.item_' + bParam_mid.substring(0,32)).addClass('item-highlight'); } } |