harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'js_fixes' into 'dev'

Browse Source 
possibly more  page jumping fixes

See merge request hubzilla/core!1486
This commit is contained in:
Max Kostikov 2019-01-24 21:57:42 +01:00
commit fafd05afb2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
view/js/main.js
View File

@ -769,7 +769,7 @@ function updateConvItems(mode,data) {
mediaPlaying = false; 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; var bimgcount = bimgs.length;
if (bimgcount) { if (bimgcount) {
@ -999,7 +999,7 @@ function liveUpdate(notify_id) {
$("#profile-jot-text-loading").hide(); $("#profile-jot-text-loading").hide();
// adjust scroll position if new content was added above viewport // 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); $(window).scrollTop($(window).scrollTop() + $("#region_2").height() - orgHeight + contentHeightDiff);
} }