live updates sort of working

2 files changed, 41 insertions, 40 deletions

diff --git a/view/head.tpl b/view/head.tpl
index 6be3f7940..d02f56c72 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -9,12 +9,24 @@
 <script type="text/javascript" src="$baseurl/include/main.js" ></script>
 
 <script type="text/javascript">
-	$(document).ready(function() { NavUpdate(); });
 
-function NavUpdate()
-	{
-		$.get("ping",function(data)
-			{
+	var src = null;
+	var prev = null;
+	var livetime = null;
+	var msie = false;
+
+	$(document).ready(function() {
+		$.ajaxSetup({cache: false});
+		msie = $.browser.msie ;
+ 		NavUpdate(); 
+	});
+
+	function NavUpdate() {
+
+		if($('#live-network').length) { src = 'network'; liveUpdate(); }
+		if($('#live-profile').length) { src = 'profile'; liveUpdate(); }
+
+		$.get("ping",function(data) {
 			$(data).find('result').each(function() {
 				var net = $(this).find('net').text();
 				if(net == 0) { net = ''; }
@@ -31,6 +43,29 @@ function NavUpdate()
 			});
 		}) ;
 		setTimeout(NavUpdate,30000);
+
 	}
+
+	function liveUpdate() {
+		if(src == null) { return; }
+		if($('.comment-edit-text-full').length) {
+			livetime = setTimeout(liveUpdate, 10000);
+			return;
+		}
+		prev = 'live-' + src;
+
+		$.get('update_' + src + '?msie=' + ((msie) ? 1 : 0),function(data) {
+			$('.wall-item-outside-wrapper',data).each(function() {
+				var ident = $(this).attr('id');
+				if($('#' + ident).length == 0) {
+					$('#' + prev).after($(this));
+				}
+				else { $('#' + ident).replaceWith($(this)); }
+				prev = ident; 
+			});
+		});
+
+	}
+
 </script>
 
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 78e0151d8..3a1d0a2ae 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -1,3 +1,4 @@
+
 <script language="javascript" type="text/javascript"
           src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
           <script language="javascript" type="text/javascript">
@@ -50,41 +51,6 @@ tinyMCE.init({
 		}
 	}
 
-	var src = null;
-
-	$(document).ready(function() {
-		if($('#live-network').length) { src = 'network';  setTimeout(liveUpdate, 30000); }
-		if($('#live-profile').length) { src = 'profile';  setTimeout(liveUpdate, 30000); }
-	});
-
-	function liveUpdate() {
-		if(src == null) { return; }
-		if($('.comment-edit-text-full').length) {
-			setTimeout(liveUpdate, 30000);
-			return;
-		}
-
-//		$.get('update_' + src,function(data)
-//			{
-//			$(data).find('#wall-item-outside-wrapper').each(function() {
-//				var net = $(this).find('net').text();
-//				if(net == 0) { net = ''; }
-//				$('#net-update').html(net);
-//				var home = $(this).find('home').text();
-//				if(home == 0) { home = ''; }
-//				$('#home-update').html(home);
-//				var mail = $(this).find('mail').text();
-//				if(mail == 0) { mail = ''; }
-//				$('#mail-update').html(mail);
-//				var intro = $(this).find('intro').text();
-//				if(intro == 0) { intro = ''; }
-//				$('#notify-update').html(intro);
-//			});
-//		}) ;
-
-		setTimeout(liveUpdate,30000);
-	}
-