Merge pull request #1095 from annando/master

[friendica.git] / js / main.js

diff --git a/js/main.js b/js/main.js
index a4a1c977cab9c799974ab26dfcffa56df0584617..14dbaf127a9057218e8888b62ff115e09db38040 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -21,6 +21,7 @@
        var src = null;
        var prev = null;
        var livetime = null;
+       var force_update = false;
        var msie = false;
        var stopped = false;
        var totStopped = false;
@@ -301,11 +302,16 @@
                prev = 'live-' + src;
 
                in_progress = true;
+
+               if ($(document).scrollTop() == 0)
+                       force_update = true;
+
                var udargs = ((netargs.length) ? '/' + netargs : '');
-               var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
+               var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0) + '&force=' + ((force_update) ? 1 : 0);
 
                $.get(update_url,function(data) {
                        in_progress = false;
+                       force_update = false;
                        //                      $('.collapsed-comments',data).each(function() {
                        //      var ident = $(this).attr('id');
                        //      var is_hidden = $('#' + ident).is(':hidden');
@@ -414,6 +420,7 @@
                $('#like-rotator-' + ident.toString()).show();
                $.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
                liking = 1;
+               force_update = true;
        }
 
        function dosubthread(ident) {
@@ -434,13 +441,33 @@
                                $('#star-' + ident).addClass('hidden');
                                $('#unstar-' + ident).removeClass('hidden');
                        }
-                       else {                  
+                       else {
                                $('#starred-' + ident).addClass('unstarred');
                                $('#starred-' + ident).removeClass('starred');
                                $('#star-' + ident).removeClass('hidden');
                                $('#unstar-' + ident).addClass('hidden');
                        }
-                       $('#like-rotator-' + ident).hide();     
+                       $('#like-rotator-' + ident).hide();
+               });
+       }
+
+       function doignore(ident) {
+               ident = ident.toString();
+               $('#like-rotator-' + ident).show();
+               $.get('ignored/' + ident, function(data) {
+                       if(data.match(/1/)) {
+                               $('#ignored-' + ident).addClass('ignored');
+                               $('#ignored-' + ident).removeClass('unignored');
+                               $('#ignore-' + ident).addClass('hidden');
+                               $('#unignore-' + ident).removeClass('hidden');
+                       }
+                       else {
+                               $('#ignored-' + ident).addClass('unignored');
+                               $('#ignored-' + ident).removeClass('ignored');
+                               $('#ignore-' + ident).removeClass('hidden');
+                               $('#unignore-' + ident).addClass('hidden');
+                       }
+                       $('#like-rotator-' + ident).hide();
                });
        }
 
@@ -505,6 +532,7 @@
                                                commentClose(tarea,id);
                                        if(timer) clearTimeout(timer);
                                        timer = setTimeout(NavUpdate,10);
+                                       force_update = true;
                                }
                                if(data.reload) {
                                        window.location.href=data.reload;
@@ -637,6 +665,7 @@ function notifyMarkAll() {
        $.get('notify/mark/all', function(data) {
                if(timer) clearTimeout(timer);
                timer = setTimeout(NavUpdate,1000);
+               force_update = true;
        });
 }