diff options
| author | Max Kostikov <max@kostikov.co> | 2019-01-24 21:57:42 +0100 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-01-24 21:57:42 +0100 |
| commit | fafd05afb20f6a3bd190ff303a1aaa7c7260a7a9 (patch) | |
| tree | 4735388256cea26444281ae0f1a6c4f8933ba271 | |
| parent | 7a3ad30bfabef867a471c4bd4f08c010903e0af2 (diff) | |
| parent | 0946ac2ff95d54bff36dfcacb7a8553070c9b3b9 (diff) | |
| download | volse-hubzilla-fafd05afb20f6a3bd190ff303a1aaa7c7260a7a9.tar.gz volse-hubzilla-fafd05afb20f6a3bd190ff303a1aaa7c7260a7a9.tar.bz2 volse-hubzilla-fafd05afb20f6a3bd190ff303a1aaa7c7260a7a9.zip | |
Merge branch 'js_fixes' into 'dev'
possibly more page jumping fixes
See merge request hubzilla/core!1486
| -rw-r--r-- | view/js/main.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js index d88133b23..fca9d125d 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -769,7 +769,7 @@ function updateConvItems(mode,data) { mediaPlaying = false; }); - var bimgs = ((preloadImages) ? false : $(".wall-item-body img").not(function() { return this.complete; })); + var bimgs = ((preloadImages) ? false : $(".wall-item-body img, .wall-photo-item img").not(function() { return this.complete; })); var bimgcount = bimgs.length; if (bimgcount) { @@ -999,7 +999,7 @@ function liveUpdate(notify_id) { $("#profile-jot-text-loading").hide(); // adjust scroll position if new content was added above viewport - if(update_mode === 'update') { + if(update_mode === 'update' && !justifiedGalleryActive) { $(window).scrollTop($(window).scrollTop() + $("#region_2").height() - orgHeight + contentHeightDiff); } |