Merge pull request #646 from annando/master

[friendica.git] / js / main.js

diff --git a/js/main.js b/js/main.js
index 4a75be747ad4da5011a3ef1f2e8c89b3da668312..488d5d4c72d63d950ac9afab4a7a092fca0a2fc7 100644 (file)
--- 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'
                });
                
 
@@ -181,7 +185,13 @@
                                        html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen'));
                                        nnm.append(html);
                                });
+
+                               $("img[data-src]", nnm).each(function(i, el){
+                                       // Add src attribute for images with a data-src attribute
+                                       $(el).attr('src', $(el).data("src"));
+                               });
                        }
+
                        notif = eNotif.attr('count');
                        if (notif>0){
                                $("#nav-notifications-linkmenu").addClass("on");
@@ -202,8 +212,7 @@
                        });
                        
                });
-               
-               
+
                NavUpdate(); 
                // Allow folks to stop the ajax page updates with the pause/break key
                $(document).keydown(function(event) {
@@ -665,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,