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

fix issue #123 again, except this time don't allow ping recursion

Browse Source
This commit is contained in:
friendica 2013-10-29 21:05:49 -07:00
parent db83080f4d
commit 7335f67246
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
js/main.js
View File

@ -121,6 +121,7 @@
var page_load = true; var page_load = true;
var loadingPage = false; var loadingPage = false;
var pageHasMoreContent = true; var pageHasMoreContent = true;
var updateCountsOnly = false;
$(function() { $(function() {
$.ajaxSetup({cache: false}); $.ajaxSetup({cache: false});
@ -269,21 +270,24 @@
} }
// start live update if(! updateCountsOnly) {
// start live update
if($('#live-network').length) { src = 'network'; liveUpdate(); } if($('#live-network').length) { src = 'network'; liveUpdate(); }
if($('#live-channel').length) { src = 'channel'; liveUpdate(); } if($('#live-channel').length) { src = 'channel'; liveUpdate(); }
if($('#live-community').length) { src = 'community'; liveUpdate(); } if($('#live-community').length) { src = 'community'; liveUpdate(); }
if($('#live-display').length) { src = 'display'; liveUpdate(); } if($('#live-display').length) { src = 'display'; liveUpdate(); }
if($('#live-search').length) { src = 'search'; liveUpdate(); } if($('#live-search').length) { src = 'search'; liveUpdate(); }
if($('#live-photos').length) { if($('#live-photos').length) {
if(liking) { if(liking) {
liking = 0; liking = 0;
window.location.href=window.location.href window.location.href=window.location.href
}
} }
} }
updateCountsOnly = false;
if(data.network == 0) { if(data.network == 0) {
data.network = ''; data.network = '';
@ -576,8 +580,9 @@ function updateConvItems(mode,data) {
updateConvItems(update_mode,data); updateConvItems(update_mode,data);
$("#page-spinner").spin(false); $("#page-spinner").spin(false);
$("#profile-jot-text-loading").spin(false); $("#profile-jot-text-loading").spin(false);
// if(timer) clearTimeout(timer); updateCountsOnly = true;
// timer = setTimeout(NavUpdate,10); if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,10);
}); });