Merge pull request #646 from annando/master

[friendica.git] / js / main.js

diff --git a/js/main.js b/js/main.js
index a28c8576f08fe1329ec1db9b6e47afb9b229a2a4..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) {
@@ -250,12 +259,13 @@
                                        if($('#live-profile').length)   { src = 'profile'; liveUpdate(); }
                                        if($('#live-community').length) { src = 'community'; liveUpdate(); }
                                        if($('#live-notes').length)     { src = 'notes'; liveUpdate(); }
-                                       if($('#live-display').length) {
+                                       if($('#live-display').length)     { src = 'display'; liveUpdate(); }
+/*                                     if($('#live-display').length) {
                                                if(liking) {
                                                        liking = 0;
                                                        window.location.href=window.location.href 
                                                }
-                                       }
+                                       }*/
                                        if($('#live-photos').length) { 
                                                if(liking) {
                                                        liking = 0;
@@ -313,10 +323,26 @@
                                        $('#' + prev).after($(this));
                                }
                                else {
+                                       // Find out if the hidden comments are open, so we can keep it that way
+                                       // if a new comment has been posted
+                                       var id = $('.hide-comments-total', this).attr('id');
+                                       if(typeof id != 'undefined') {
+                                               id = id.split('-')[3];
+                                               var commentsOpen = $("#collapsed-comments-" + id).is(":visible");
+                                       }
+
                                        $('img',this).each(function() {
                                                $(this).attr('src',$(this).attr('dst'));
                                        });
+                                       //vScroll = $(document).scrollTop();
+                                       $('html').height($('html').height());
                                        $('#' + ident).replaceWith($(this));
+
+                                       if(typeof id != 'undefined') {
+                                               if(commentsOpen) showHideComments(id);
+                                       }
+                                       $('html').height('auto');
+                                       //$(document).scrollTop(vScroll);
                                }
                                prev = ident;
                        });
@@ -380,11 +406,17 @@
                unpause();
                $('#like-rotator-' + ident.toString()).show();
                $.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
-//             if(timer) clearTimeout(timer);
-//             timer = setTimeout(NavUpdate,3000);
                liking = 1;
        }
 
+       function dosubthread(ident) {
+               unpause();
+               $('#like-rotator-' + ident.toString()).show();
+               $.get('subthread/' + ident.toString(), NavUpdate );
+               liking = 1;
+       }
+
+
        function dostar(ident) {
                ident = ident.toString();
                $('#like-rotator-' + ident).show();
@@ -497,6 +529,19 @@
 
 
 
+       function showHideComments(id) {
+               if( $("#collapsed-comments-" + id).is(":visible")) {
+                       $("#collapsed-comments-" + id).hide();
+                       $("#hide-comments-" + id).html(window.showMore);
+               }
+               else {
+                       $("#collapsed-comments-" + id).show();
+                       $("#hide-comments-" + id).html(window.showFewer);
+               }
+       }
+
+
+
        function preview_post() {
                $("#jot-preview").val("1");
                $("#jot-preview-content").show();
@@ -629,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,