From 25b972bee2a708ab794cabf44f54163eb2edc787 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 11 Nov 2011 17:00:05 +0100
Subject: js: start liveupdate after ping returns to stop continuos welcome
 message

As liveupdate start before ping but returns after, it overwrite session
edit by ping, restoring already shown and deleted notices and infos
---
 js/main.js | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

(limited to 'js')

diff --git a/js/main.js b/js/main.js
index 15c5b5d1f..9832b2cbc 100644
--- a/js/main.js
+++ b/js/main.js
@@ -168,28 +168,35 @@
 
 	function NavUpdate() {
 
-		if($('#live-network').length)   { src = 'network'; liveUpdate(); }
-		if($('#live-profile').length)   { src = 'profile'; liveUpdate(); }
-		if($('#live-community').length) { src = 'community'; liveUpdate(); }
-		if($('#live-notes').length)     { src = 'notes'; liveUpdate(); }
-		if($('#live-display').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 
-			}
-		}
-
 		if(! stopped) {
 			$.get("ping",function(data) {
 				$(data).find('result').each(function() {
 					// send nav-update event
 					$('nav').trigger('nav-update', this);
+					
+					
+					// start live update
+
+					if($('#live-network').length)   { src = 'network'; liveUpdate(); }
+					if($('#live-profile').length)   { src = 'profile'; liveUpdate(); }
+					if($('#live-community').length) { src = 'community'; liveUpdate(); }
+					if($('#live-notes').length)     { src = 'notes'; liveUpdate(); }
+					if($('#live-display').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 
+						}
+					}
+
+					
+					
+					
 				});
 			}) ;
 		}
-- 
cgit v1.2.3