X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=include%2Fmain.js;h=abd097e54a07bcfd7442377823039f264b52e8b4;hb=9f1f9da89bb98d768b7a41b388e9c5c0d28ec946;hp=f87d87fb9aea80d060f84668976bdefbe1454fb1;hpb=d0bb2d30361c08f74d831b7abe2b2e7c479d0352;p=friendica.git

diff --git a/include/main.js b/include/main.js
index f87d87fb9a..abd097e54a 100644
--- a/include/main.js
+++ b/include/main.js
@@ -16,7 +16,7 @@
       document.getElementById(theID).style.display = "none" 
   }
 
-
+	
 	var src = null;
 	var prev = null;
 	var livetime = null;
@@ -24,12 +24,14 @@
 	var stopped = false;
 	var timer = null;
 	var pr = 0;
+	var liking = 0;
+	var in_progress = false;
 
 	$(document).ready(function() {
 		$.ajaxSetup({cache: false});
+
 		msie = $.browser.msie ;
  		NavUpdate(); 
-		sparkler();
 		// Allow folks to stop the ajax page updates with the pause/break key
 		$(document).keypress(function(event) {
 			if(event.keyCode == '19') {
@@ -43,27 +45,33 @@
 					$('#pause').html('');
 				}
 			}
+// this is shift-home on FF, but $ on IE, disabling until I figure out why the diff.
+// update: incompatible usage of onKeyDown vs onKeyPress
+//			if(event.keyCode == '36' && event.shiftKey == true) {
+//				if(homebase !== undefined) {
+//					event.preventDefault();
+//					document.location = homebase;
+//				}
+//			}
 		});					
 	});
 
-	var spark = false;
-	function sparkler() {
-		if(spark) { 
-			$('.sparkle').css({cursor: 'pointer'});
-			spark = false;
-		}
-		else {
-			$('.sparkle').css({cursor: 'crosshair'});
-			spark = true;
-		}
-		setTimeout(sparkler,500);
-	}
-	
-
 	function NavUpdate() {
 
 		if($('#live-network').length) { src = 'network'; liveUpdate(); }
 		if($('#live-profile').length) { src = 'profile'; 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) {
@@ -78,8 +86,12 @@
 					if(mail == 0) { mail = ''; }
 					$('#mail-update').html(mail);
 					var intro = $(this).find('intro').text();
+					var register = $(this).find('register').text();
 					if(intro == 0) { intro = ''; }
+					if(register != 0 && intro != '') { intro = intro+'/'+register; }
+					if(register != 0 && intro == '') { intro = '0/'+register; }
 					$('#notify-update').html(intro);
+
 				});
 			}) ;
 		}
@@ -89,13 +101,15 @@
 
 	function liveUpdate() {
 		if((src == null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; }
-		if($('.comment-edit-text-full').length) {
+		if(($('.comment-edit-text-full').length) || (in_progress)) {
 			livetime = setTimeout(liveUpdate, 10000);
 			return;
 		}
 		prev = 'live-' + src;
 
+		in_progress = true;
 		$.get('update_' + src + '?p=' + profile_uid + '&msie=' + ((msie) ? 1 : 0),function(data) {
+			in_progress = false;
 			$('.wall-item-outside-wrapper',data).each(function() {
 				var ident = $(this).attr('id');
 				if($('#' + ident).length == 0) { 
@@ -150,6 +164,7 @@
 		$.get('like/' + ident.toString() + '?verb=' + verb );
 		if(timer) clearTimeout(timer);
 		timer = setTimeout(NavUpdate,3000);
+		liking = 1;
 	}
 
 	function getPosition(e) {
@@ -196,3 +211,23 @@
 		$('#panel').hide();
 	}
 
+	function post_comment(id) {
+		$.post(  
+             "item",  
+             $("#comment-edit-form-" + id).serialize(),
+			function(data) {
+				if(data.success) {
+					$("#comment-edit-wrapper-" + id).hide();
+					$("#comment-edit-text-" + id).val('');
+    	  			var tarea = document.getElementById("comment-edit-text-" + id);
+					if(tarea)
+						commentClose(tarea,id);
+					if(timer) clearTimeout(timer);
+					timer = setTimeout(NavUpdate,10);
+				}
+			},
+			"json"  
+         );  
+         return false;  
+	}
+