X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=js%2Fmain.js;h=a7ffca8d8620b0744babffa2d28d675e09485b77;hb=cf0ebd952f662654f5e1291845fa82b1047155d4;hp=488d5d4c72d63d950ac9afab4a7a092fca0a2fc7;hpb=6690cd3fd8963388547ebfcd12ef0784dd794cea;p=friendica.git diff --git a/js/main.js b/js/main.js index 488d5d4c72..a7ffca8d86 100644 --- a/js/main.js +++ b/js/main.js @@ -21,6 +21,7 @@ var src = null; var prev = null; var livetime = null; + var force_update = false; var msie = false; var stopped = false; var totStopped = false; @@ -188,7 +189,11 @@ $("img[data-src]", nnm).each(function(i, el){ // Add src attribute for images with a data-src attribute - $(el).attr('src', $(el).data("src")); + // However, don't bother if the data-src attribute is empty, because + // an empty "src" tag for an image will cause some browsers + // to prefetch the root page of the Friendica hub, which will + // unnecessarily load an entire profile/ or network/ page + if($(el).data("src") != '') $(el).attr('src', $(el).data("src")); }); } @@ -297,11 +302,16 @@ prev = 'live-' + src; in_progress = true; + + if ($(document).scrollTop() == 0) + force_update = true; + var udargs = ((netargs.length) ? '/' + netargs : ''); - var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0); + var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0) + '&force=' + ((force_update) ? 1 : 0); $.get(update_url,function(data) { in_progress = false; + force_update = false; // $('.collapsed-comments',data).each(function() { // var ident = $(this).attr('id'); // var is_hidden = $('#' + ident).is(':hidden'); @@ -381,6 +391,9 @@ } /* autocomplete @nicknames */ $(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl"); + + // setup videos, since VideoJS won't take care of any loaded via AJAX + if(typeof videojs != 'undefined') videojs.autoSetup(); }); } @@ -407,6 +420,7 @@ $('#like-rotator-' + ident.toString()).show(); $.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate ); liking = 1; + force_update = true; } function dosubthread(ident) { @@ -498,6 +512,7 @@ commentClose(tarea,id); if(timer) clearTimeout(timer); timer = setTimeout(NavUpdate,10); + force_update = true; } if(data.reload) { window.location.href=data.reload; @@ -630,6 +645,7 @@ function notifyMarkAll() { $.get('notify/mark/all', function(data) { if(timer) clearTimeout(timer); timer = setTimeout(NavUpdate,1000); + force_update = true; }); }