Merge branch 'pull'

[friendica.git] / include / main.js

diff --git a/include/main.js b/include/main.js
index 8779f84134325cc568bc612fad3085183e487f2f..0d68c2b2b30177a2e28d8c71b0d3cc7b28a27453 100644 (file)
--- a/include/main.js
+++ b/include/main.js
@@ -27,6 +27,7 @@
        var liking = 0;
        var in_progress = false;
        var langSelect = false;
+       var commentBusy = false;
 
        $(document).ready(function() {
                $.ajaxSetup({cache: false});
@@ -90,26 +91,26 @@
                        $.get("ping",function(data) {
                                $(data).find('result').each(function() {
                                        var net = $(this).find('net').text();
-                                       if(net == 0) { net = ''; }
+                                       if(net == 0) { net = ''; $('#net-update').hide() } else { $('#net-update').show() }
                                        $('#net-update').html(net);
                                        var home = $(this).find('home').text();
-                                       if(home == 0) { home = ''; }
+                                       if(home == 0) { home = '';  $('#home-update').hide() } else { $('#home-update').show() }
                                        $('#home-update').html(home);
                                        var mail = $(this).find('mail').text();
-                                       if(mail == 0) { mail = ''; }
+                                       if(mail == 0) { mail = '';  $('#mail-update').hide() } else { $('#mail-update').show() }
                                        $('#mail-update').html(mail);
                                        var intro = $(this).find('intro').text();
                                        var register = $(this).find('register').text();
                                        if(intro == 0) { intro = ''; }
                                        if(register != 0 && intro != '') { intro = intro+'/'+register; }
                                        if(register != 0 && intro == '') { intro = '0/'+register; }
+                                       if (intro == '') { $('#notify-update').hide() } else { $('#notify-update').show() }
                                        $('#notify-update').html(intro);
 
                                });
                        }) ;
                }
                timer = setTimeout(NavUpdate,30000);
-
        }
 
        function liveUpdate() {
@@ -128,13 +129,16 @@
                        in_progress = false;
                        $('.ccollapse-wrapper',data).each(function() {
                                var ident = $(this).attr('id');
+                               var is_hidden = $('#' + ident).is(':hidden');
                                if($('#' + ident).length) {
                                        $('#' + ident).replaceWith($(this));
+                                       if(is_hidden)
+                                               $('#' + ident).hide();
                                }
                        });
                        $('.wall-item-outside-wrapper',data).each(function() {
                                var ident = $(this).attr('id');
-                               if($('#' + ident).length == 0) { 
+                               if($('#' + ident).length == 0) {
                                        $('img',this).each(function() {
                                                $(this).attr('src',$(this).attr('dst'));
                                        });
@@ -153,20 +157,19 @@
                                prev = ident; 
                        });
                        $('.like-rotator').hide();
+                       if(commentBusy) {
+                               commentBusy = false;
+                               $('body').css('cursor', 'auto');
+                       }
                });
-
        }
 
        function imgbright(node) {
-               $(node).attr("src",$(node).attr("src").replace('hide','show'));
-               $(node).css('width',24);
-               $(node).css('height',24);
+               $(node).removeClass("drophide").addClass("drop");
        }
 
        function imgdull(node) {
-               $(node).attr("src",$(node).attr("src").replace('show','hide'));
-               $(node).css('width',16);
-               $(node).css('height',16);
+               $(node).removeClass("drop").addClass("drophide");
        }
 
        // Since our ajax calls are asynchronous, we will give a few 
@@ -232,6 +235,8 @@
        }
 
        function post_comment(id) {
+               commentBusy = true;
+               $('body').css('cursor', 'wait');
                $.post(  
              "item",  
              $("#comment-edit-form-" + id).serialize(),
@@ -248,7 +253,6 @@
                                if(data.reload) {
                                        window.location.href=data.reload;
                                }
-                                       
                        },
                        "json"  
          );  
@@ -277,4 +281,21 @@
         }  
           
         return a.join('');  
-    }  
\ No newline at end of file
+    }  
+
+       function groupChangeMember(gid,cid) {
+               $('body .fakelink').css('cursor', 'wait');
+               $.get('group/' + gid + '/' + cid, function(data) {
+                               $('#group-update-wrapper').html(data);
+                               $('body .fakelink').css('cursor', 'auto');                              
+               });
+       }
+
+       function profChangeMember(gid,cid) {
+               $('body .fakelink').css('cursor', 'wait');
+               $.get('profperm/' + gid + '/' + cid, function(data) {
+                               $('#prof-update-wrapper').html(data);
+                               $('body .fakelink').css('cursor', 'auto');                              
+               });
+       }
+