X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=js%2Fmain.js;h=5a1affe3cb7aa3cb815d3eca84622aa96b52fff8;hb=94e8139c7e5bd90d814e18c6a7ce2b4d44008100;hp=b28b1079b73c181f8d8eb240c9ef5090330bab98;hpb=093a3e6742e8cb008d75c40ce713d6d42082e6ec;p=friendica.git

diff --git a/js/main.js b/js/main.js
index b28b1079b7..5a1affe3cb 100644
--- a/js/main.js
+++ b/js/main.js
@@ -1,22 +1,22 @@
-  function resizeIframe(obj) {
-    obj.style.height = 0;
-	_resizeIframe(obj, 0);
-  }
-  
-  function _resizeIframe(obj, desth) {
-	var h = obj.style.height;
-	var ch = obj.contentWindow.document.body.scrollHeight + 'px';
-	if (h==ch) {
-		return;
+	function resizeIframe(obj) {
+		//obj.style.height = 0;
+		_resizeIframe(obj, 0);
 	}
-	console.log("_resizeIframe", obj, desth, ch);
-	if (desth!=ch) {
-		setTimeout(_resizeIframe, 500, obj, ch);
-	} else {
-		obj.style.height  = ch;
-		setTimeout(_resizeIframe, 1000, obj, ch);
+
+	function _resizeIframe(obj, desth) {
+		var h = obj.style.height;
+		var ch = obj.contentWindow.document.body.scrollHeight + 'px';
+		if (h==ch) {
+			return;
+		}
+		//console.log("_resizeIframe", obj, desth, ch);
+		if (desth!=ch) {
+			setTimeout(_resizeIframe, 500, obj, ch);
+		} else {
+			if (ch>0) obj.style.height  = ch;
+			setTimeout(_resizeIframe, 1000, obj, ch);
+		}
 	}
-  }
 
   function openClose(theID) {
     if(document.getElementById(theID).style.display == "block") {
@@ -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();
@@ -311,6 +317,9 @@
 				$.jGrowl(text, { sticky: false, theme: 'info', life: 5000 });
 			});
 
+			/* update the js scrollbars */
+			$('#nav-notifications-menu').perfectScrollbar('update');
+
 		});
 
  		NavUpdate();