4 files changed, 28 insertions, 13 deletions

diff --git a/view/js/main.js b/view/js/main.js
index 77b8e91e7..52b836936 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -881,10 +881,11 @@ function notify_popup_loader(notifyType) {
 	/* notifications template - different for navbar and notifications widget */
 	var navbar_notifications_tpl= unescape($("#navbar-notifications-template[rel=template]").html());
 	var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
-	var notifications_all = unescape($('<div>').append( $("#nav-" + notifyType + "-see-all").clone() ).html()); //outerHtml hack
-	var notifications_mark = unescape($('<div>').append( $("#nav-" + notifyType + "-mark-all").clone() ).html()); //outerHtml hack
-	var notifications_tt_only = unescape($('<div>').append( $("#tt-" + notifyType + "-only").clone() ).html()); //outerHtml hack
-	var notifications_empty = unescape($("#nav-" + notifyType + "-menu").html());
+	//var notifications_all = unescape($('<div>').append( $("#nav-" + notifyType + "-see-all").clone() ).html()); //outerHtml hack
+	//var notifications_mark = unescape($('<div>').append( $("#nav-" + notifyType + "-mark-all").clone() ).html()); //outerHtml hack
+	//var notifications_tt_only = unescape($('<div>').append( $("#tt-" + notifyType + "-only").clone() ).html()); //outerHtml hack
+	//var notifications_cn_only = unescape($('<div>').append( $("#cn-" + notifyType + "-only").clone() ).html()); //outerHtml hack
+	//var notifications_empty = unescape($("#nav-" + notifyType + "-menu").html());
 
 	var notify_menu = $("#nav-" + notifyType + "-menu");
 
@@ -895,11 +896,13 @@ function notify_popup_loader(notifyType) {
 			window.location.href=window.location.href;
 		}
 
-		$("#navbar-" + notifyType + "-menu").html(notifications_all + notifications_mark + notifications_tt_only);
-		$("#nav-" + notifyType + "-menu").html(notifications_all + notifications_mark + notifications_tt_only);
+		//$("#navbar-" + notifyType + "-menu").html(notifications_all + notifications_mark + notifications_tt_only + notifications_cn_only);
+		//$("#nav-" + notifyType + "-menu").html(notifications_all + notifications_mark + notifications_tt_only + notifications_cn_only);
 
 		$("." + notifyType + "-update").html(data.notify.length);
 
+		notify_menu.html('');
+
 		$(data.notify).each(function() {
 			html = navbar_notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass,this.b64mid,this.notify_id,this.thread_top);
 			$("#navbar-" + notifyType + "-menu").append(html);
@@ -915,11 +918,23 @@ function notify_popup_loader(notifyType) {
 
 		if($('#tt-' + notifyType + '-only').hasClass('active'))
 			$('#nav-' + notifyType + '-menu [data-thread_top=false]').hide();
+
+		var filter = $('#cn-' + notifyType + '-input').val();
+
+		if(filter) {
+			$('#nav-' + notifyType + '-menu .notification').each(function(i, el){
+				var cn = $(el).data('contact_name').toLowerCase();
+				if(cn.indexOf(filter) === -1)
+					$(this).addClass('d-none');
+				else
+					$(this).removeClass('d-none');
+			});
+		}
 	});
 
 
 	setTimeout(function() {
-		if(notify_menu.hasClass('show')) {
+		if($('#nav-' + notifyType + '-sub').hasClass('show')) {
 			console.log('updating ' + notifyType + ' notifications...');
 			setTimeout(notify_popup_loader, updateInterval, notifyType);
 		}
diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js
index 7100e0d07..34e9a3b21 100644
--- a/view/js/mod_connedit.js
+++ b/view/js/mod_connedit.js
@@ -19,7 +19,7 @@ $(document).ready(function() {
 
 
 	$('#id_permcat').change(function() {
-		$('.loading-role-rotator').spin(true);
+		$('.loading').toggleClass('invisible');
 		var permName = $('#id_permcat').val();
 		loadAbookRole(permName);
 	});
@@ -128,7 +128,7 @@ function loadAbookRole(name) {
 			if(this.value)
 				$('#me_id_perms_' + this.name).attr('checked','checked');
 		});
-		$('.loading-role-rotator').spin(false);
+		$('.loading').toggleClass('invisible');
 	});
 }
 
diff --git a/view/js/mod_defperms.js b/view/js/mod_defperms.js
index c89142579..18ebe268e 100644
--- a/view/js/mod_defperms.js
+++ b/view/js/mod_defperms.js
@@ -1,7 +1,7 @@
 $(document).ready(function() {
 
 	$('#id_permcat').change(function() {
-		$('.loading-role-rotator').show();
+		$('.loading').toggleClass('invisible');
 		var permName = $('#id_permcat').val();
 		loadConnectionRole(permName);
 	});
@@ -25,7 +25,7 @@ function loadConnectionRole(name) {
 			if(this.value)
 				$('#id_perms_' + this.name).attr('checked','checked');
 		});
-		$('.loading-role-rotator').hide();
+		$('.loading').toggleClass('invisible');
 	});
 }
 
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index f9faa3d5c..d3392c748 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -19,7 +19,7 @@ $(document).ready(function() {
 	});
 
 	$('#id_permcat_list').change(function() {
-		$('.loading-role-rotator').spin(true);
+		$('.loading').toggleClass('invisible');
 		var permName = $('#id_permcat').val();
 		loadPermcat(permName);
 	});
@@ -172,7 +172,7 @@ function loadPermcat(name) {
 			if(this.value)
 				$('#me_id_perms_' + this.name).attr('checked','checked');
 		});
-		$('.loading-role-rotator').spin(false);
+		$('.loading').toggleClass('invisible');
 	});
 }