X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=js%2Fmain.js;h=488d5d4c72d63d950ac9afab4a7a092fca0a2fc7;hb=cc210bae3de704eaaef608e9083452fb982fff4a;hp=f17d1eaa0f747a2790b3e3070b9944f59231d2bb;hpb=1c81409bf8acae0594a813ae0408cf918569a953;p=friendica.git

diff --git a/js/main.js b/js/main.js
index f17d1eaa0f..488d5d4c72 100644
--- a/js/main.js
+++ b/js/main.js
@@ -103,9 +103,13 @@
 		});
 		
 		// fancyboxes
-		$("a.popupbox").fancybox({
+		/*$("a.popupbox").fancybox({
 			'transitionIn' : 'elastic',
 			'transitionOut' : 'elastic'
+		});*/
+		$("a.popupbox").colorbox({
+			'inline' : true,
+			'transition' : 'elastic'
 		});
 		
 
@@ -670,9 +674,9 @@ function setupFieldRichtext(){
 		entity_encoding : "raw",
 		add_unload_trigger : false,
 		remove_linebreaks : false,
-		force_p_newlines : false,
-		force_br_newlines : true,
-		forced_root_block : '',
+		//force_p_newlines : false,
+		//force_br_newlines : true,
+		forced_root_block : 'div',
 		convert_urls: false,
 		content_css: baseurl+"/view/custom_tinymce.css",
 		theme_advanced_path : false,