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

make always preload images before rendering the page a display setting

Browse Source
This commit is contained in:
Mario Vavti
2016-02-17 12:32:12 +01:00
parent b8c7b2f81d
commit ddbe3c7426
5 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
view/js/main.js
View File

@@ -618,7 +618,7 @@ function updateConvItems(mode,data) {
/* autocomplete @nicknames */
$(".comment-edit-form textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
var bimgs = $(".wall-item-body img").not(function() { return this.complete; });
var bimgs = ((preloadImages) ? false : $(".wall-item-body img").not(function() { return this.complete; }));
var bimgcount = bimgs.length;
if (bimgcount) {
@@ -632,8 +632,6 @@ function updateConvItems(mode,data) {
collapseHeight();
}
//collapseHeight();
}
function collapseHeight() {
@@ -742,8 +740,7 @@ function liveUpdate() {
var dready = new Date();
console.log('DATA ready in: ' + (dready - dstart)/1000 + ' seconds.');
if(update_mode === 'update') {
if(update_mode === 'update' || preloadImages) {
console.log('LOADING images...');
$('.wall-item-body, .wall-photo-item',data).imagesLoaded( function() {
@@ -757,7 +754,9 @@ function liveUpdate() {
$("#profile-jot-text-loading").spin(false);
// adjust scroll position if new content was added above viewport
$(window).scrollTop($(window).scrollTop() + $("#region_2").height() - orgHeight + contentHeightDiff);
if(update_mode === 'update') {
$(window).scrollTop($(window).scrollTop() + $("#region_2").height() - orgHeight + contentHeightDiff);
}
in_progress = false;