X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=js%2Fmain.js;h=5a1affe3cb7aa3cb815d3eca84622aa96b52fff8;hb=468734a26ee6f7aeadcaaa5a2ba10c3b613c8dcc;hp=ca4cc770cdef20c27f88e6ce2126164b6c023a17;hpb=03000beac6a70b6f5bb1e6852a2aad4eb6f52787;p=friendica.git

diff --git a/js/main.js b/js/main.js
index ca4cc770cd..5a1affe3cb 100644
--- a/js/main.js
+++ b/js/main.js
@@ -9,7 +9,7 @@
 		if (h==ch) {
 			return;
 		}
-		console.log("_resizeIframe", obj, desth, ch);
+		//console.log("_resizeIframe", obj, desth, ch);
 		if (desth!=ch) {
 			setTimeout(_resizeIframe, 500, obj, ch);
 		} else {
@@ -147,6 +147,7 @@
 			} else {
 				last_popup_menu = menu;
 				last_popup_button = parent;
+				$('#nav-notifications-menu').perfectScrollbar('update');
 			}
 			return false;
 		});
@@ -159,7 +160,9 @@
 			'inline' : true,
 			'transition' : 'elastic'
 		});
-
+		$("a.ajax-popupbox").colorbox({
+			'transition' : 'elastic'
+		});
 
 		/* notifications template */
 		var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
@@ -167,6 +170,9 @@
 		var notifications_mark = unescape($('<div>').append( $("#nav-notifications-mark-all").clone() ).html()); //outerHtml hack
 		var notifications_empty = unescape($("#nav-notifications-menu").html());
 
+		/* enable perfect-scrollbars for different elements */
+		$('#nav-notifications-menu, aside').perfectScrollbar();
+
 		/* nav update event  */
 		$('nav').bind('nav-update', function(e,data){
 			var invalid = $(data).find('invalid').text();
@@ -247,13 +253,18 @@
 				eNotif.children("note").each(function(){
 					e = $(this);
 					var text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
+					var contact = ("<a href="+e.attr('url')+"><span class='contactname'>"+e.attr('name')+"</span></a>");
 					var seenclass = (e.attr('seen')==1)?"notify-seen":"notify-unseen";
-					var html = notifications_tpl.format(e.attr('href'),
-						e.attr('photo'),                    // {0}
-						text,                               // {1}
-						e.attr('date'),                     // {2}
-						seenclass,                          // {3}
-						new Date(e.attr('timestamp')*1000)  // {4}
+					var html = notifications_tpl.format(
+						e.attr('href'),                     // {0}  // link to the source
+						e.attr('photo'),                    // {1}  // photo of the contact
+						text,                               // {2}  // preformatet text (autor + text)
+						e.attr('date'),                     // {3}  // date of notification (time ago)
+						seenclass,                          // {4}  // vistiting status of the notification
+						new Date(e.attr('timestamp')*1000), // {5}  //date of notification
+						e.attr('url'),                      // {6}  // profile url of the contact
+						e.text().format(""),                // {7}  // clean status text
+						contact                             // {8}  //preformatat author (name + profile url)
 					);
 					nnm.append(html);
 				});
@@ -306,6 +317,9 @@
 				$.jGrowl(text, { sticky: false, theme: 'info', life: 5000 });
 			});
 
+			/* update the js scrollbars */
+			$('#nav-notifications-menu').perfectScrollbar('update');
+
 		});
 
  		NavUpdate();