From 7335f6724656e5e44353f1635226b1b6b43006e0 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 29 Oct 2013 21:05:49 -0700
Subject: fix issue #123 again, except this time don't allow ping recursion

---
 js/main.js | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'js')

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