X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=js%2Fmain.js;h=bd6dfc852033948f366e951dcb11f208114ba1a9;hb=4832bc74f55e7d3e6f66d281f5de3a071fe1e071;hp=ac238bf6aa65d568702491da2a8b46cf359c5864;hpb=caa6bc96f38e8877a4c12dc90daa9f38f332adde;p=friendica.git

diff --git a/js/main.js b/js/main.js
index ac238bf6aa..bd6dfc8520 100644
--- a/js/main.js
+++ b/js/main.js
@@ -73,7 +73,16 @@
 		setupFieldRichtext();
 
 		/* popup menus */
+	function close_last_popup_menu() {
+ 		if(last_popup_menu) {
+ 		last_popup_menu.hide();
+ 		last_popup_button.removeClass("selected");
+ 		last_popup_menu = null;
+ 		last_popup_button = null;
+ 		}
+ 		}
 		$('a[rel^=#]').click(function(e){
+			close_last_popup_menu();
 			menu = $( $(this).attr('rel') );
 			e.preventDefault();
 			e.stopPropagation();
@@ -90,12 +99,7 @@
 			return false;
 		});
 		$('html').click(function() {
-			if(last_popup_menu) {
-				last_popup_menu.hide();
-				last_popup_button.removeClass("selected");
-				last_popup_menu = null;
-				last_popup_button = null;
-			}
+						close_last_popup_menu();
 		});
 		
 		// fancyboxes
@@ -113,6 +117,9 @@
 		
 		/* nav update event  */
 		$('nav').bind('nav-update', function(e,data){;
+			var invalid = $(data).find('invalid').text();
+			if(invalid == 1) { window.location.href=window.location.href }
+
 			var net = $(data).find('net').text();
 			if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') }
 			$('#net-update').html(net);
@@ -137,6 +144,29 @@
 			if(mail == 0) { mail = '';  $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') }
 			$('#mail-update-li').html(mail);
 
+
+			var allevents = $(data).find('all-events').text();
+			if(allevents == 0) { allevents = ''; $('#allevents-update').removeClass('show') } else { $('#allevents-update').addClass('show') }
+			$('#allevents-update').html(allevents);
+
+			var alleventstoday = $(data).find('all-events-today').text();
+			if(alleventstoday == 0) { $('#allevents-update').removeClass('notif-allevents-today') } else { $('#allevents-update').addClass('notif-allevents-today') }
+
+			var events = $(data).find('events').text();
+			if(events == 0) { events = ''; $('#events-update').removeClass('show') } else { $('#events-update').addClass('show') }
+			$('#events-update').html(events);
+
+			var eventstoday = $(data).find('events-today').text();
+			if(eventstoday == 0) { $('#events-update').removeClass('notif-events-today') } else { $('#events-update').addClass('notif-events-today') }
+
+			var birthdays = $(data).find('birthdays').text();
+			if(birthdays == 0) {birthdays = ''; $('#birthdays-update').removeClass('show') } else { $('#birthdays-update').addClass('show') }
+			$('#birthdays-update').html(birthdays);
+
+			var birthdaystoday = $(data).find('birthdays-today').text();
+			if(birthdaystoday == 0) { $('#birthdays-update').removeClass('notif-birthdays-today') } else { $('#birthdays-update').addClass('notif-birthdays-today') }
+
+
 			var eNotif = $(data).find('notif')
 			
 			if (eNotif.children("note").length==0){
@@ -207,7 +237,8 @@
 	function NavUpdate() {
 
 		if(! stopped) {
-			$.get("ping",function(data) {
+			var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : '');
+			$.get(pingCmd,function(data) {
 				$(data).find('result').each(function() {
 					// send nav-update event
 					$('nav').trigger('nav-update', this);
@@ -272,8 +303,7 @@
 			//});
 
 			// add a new thread
-
-			$('.tread-wrapper',data).each(function() {
+			$('.toplevel_item',data).each(function() {
 				var ident = $(this).attr('id');
 
 				if($('#' + ident).length == 0 && profile_page == 1) {
@@ -349,12 +379,18 @@
 	function dolike(ident,verb) {
 		unpause();
 		$('#like-rotator-' + ident.toString()).show();
-		$.get('like/' + ident.toString() + '?verb=' + verb );
-		if(timer) clearTimeout(timer);
-		timer = setTimeout(NavUpdate,3000);
+		$.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
+		liking = 1;
+	}
+
+	function dosubthread(ident) {
+		unpause();
+		$('#like-rotator-' + ident.toString()).show();
+		$.get('subthread/' + ident.toString(), NavUpdate );
 		liking = 1;
 	}
 
+
 	function dostar(ident) {
 		ident = ident.toString();
 		$('#like-rotator-' + ident).show();
@@ -633,7 +669,7 @@ Array.prototype.remove = function(item) {
 function previewTheme(elm) {
 	theme = $(elm).val();
 	$.getJSON('pretheme?f=&theme=' + theme,function(data) {
-			$('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>');
+			$('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><div id="theme-version">' + data.version + '</div><div id="theme-credits">' + data.credits + '</div><a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>');
 	});
 
 }