X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fmain.js;h=fcd1d6fee0bc4e1a624ff40a969de771b85fb9bb;hb=c4ddee005ebcf912c913e12a17e65ab8826650a6;hp=6d743c4f4922c01dc7429c7baa9332bfb7174360;hpb=dda51954185ef5a1801ef2b9a2b99cb796399a91;p=friendica.git

diff --git a/include/main.js b/include/main.js
index 6d743c4f49..fcd1d6fee0 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,13 @@
 	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 +44,31 @@
 					$('#pause').html('');
 				}
 			}
+			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 +83,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 +98,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,22 +161,22 @@
 		$.get('like/' + ident.toString() + '?verb=' + verb );
 		if(timer) clearTimeout(timer);
 		timer = setTimeout(NavUpdate,3000);
+		liking = 1;
 	}
 
 	function getPosition(e) {
-		e = e || window.event;
 		var cursor = {x:0, y:0};
-		if ( e.pageX > 0 || e.pageY > 0 ) {
+		if ( e.pageX || e.pageY  ) {
 			cursor.x = e.pageX;
 			cursor.y = e.pageY;
 		}
 		else {
-			if( e.clientX > 0 || e.clientY > 0 ) {
-				cursor.x = e.clientX;
-				cursor.y = e.clientY;
+			if( e.clientX || e.clientY ) {
+				cursor.x = e.clientX + (document.documentElement.scrollLeft || document.body.scrollLeft) - document.documentElement.clientLeft;
+				cursor.y = e.clientY + (document.documentElement.scrollTop  || document.body.scrollTop)  - document.documentElement.clientTop;
 			}
 			else {
-				if( e.x > 0 || e.y > 0 ) {
+				if( e.x || e.y ) {
 					cursor.x = e.x;
 					cursor.y = e.y;
 				}
@@ -177,13 +188,14 @@
 	var lockvisible = false;
 
 	function lockview(event,id) {
+		event = event || window.event;
+		cursor = getPosition(event);
 		if(lockvisible) {
 			lockviewhide();
 		}
 		else {
 			lockvisible = true;
 			$.get('lockview/' + id, function(data) {
-				cursor = getPosition(event);
 				$('#panel').html(data);
 				$('#panel').css({ 'left': cursor.x + 5 , 'top': cursor.y + 5});
 				$('#panel').show();