Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

1 files changed, 18 insertions, 14 deletions

diff --git a/view/js/main.js b/view/js/main.js
index 77b8e91e7..0e3dcb0ec 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -878,33 +878,26 @@ function justifyPhotosAjax(id) {
 
 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 notify_menu = $("#nav-" + notifyType + "-menu");
-
 	var pingExCmd = 'ping/' + notifyType + ((localUser != 0) ? '?f=&uid=' + localUser : '');
+
 	$.get(pingExCmd, function(data) {
 
 		if(data.invalid == 1) { 
 			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);
 			html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass,this.b64mid,this.notify_id,this.thread_top);
-			$("#nav-" + notifyType + "-menu").append(html);
+			notify_menu.append(html);
 		});
 
 		$(".dropdown-menu img[data-src], .notification img[data-src]").each(function(i, el){
@@ -915,11 +908,22 @@ 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);
 		}