Merge branch 'master' of git://github.com/friendika/friendika

[friendica.git] / include / main.js

diff --git a/include/main.js b/include/main.js
index f87d87fb9aea80d060f84668976bdefbe1454fb1..ef6b059ccfb00f01e75a72bd403364890760b3e1 100644 (file)
--- a/include/main.js
+++ b/include/main.js
@@ -16,7 +16,7 @@
       document.getElementById(theID).style.display = "none" 
   }
 
-
+       
        var src = null;
        var prev = null;
        var livetime = null;
@@ -24,12 +24,13 @@
        var stopped = false;
        var timer = null;
        var pr = 0;
+       var liking = 0;
+       var in_progress = false;
 
        $(document).ready(function() {
                $.ajaxSetup({cache: false});
                msie = $.browser.msie ;
                NavUpdate(); 
-               sparkler();
                // Allow folks to stop the ajax page updates with the pause/break key
                $(document).keypress(function(event) {
                        if(event.keyCode == '19') {
@@ -46,24 +47,22 @@
                });                                     
        });
 
-       var spark = false;
-       function sparkler() {
-               if(spark) { 
-                       $('.sparkle').css({cursor: 'pointer'});
-                       spark = false;
-               }
-               else {
-                       $('.sparkle').css({cursor: 'crosshair'});
-                       spark = true;
-               }
-               setTimeout(sparkler,500);
-       }
-       
-
        function NavUpdate() {
 
                if($('#live-network').length) { src = 'network'; liveUpdate(); }
                if($('#live-profile').length) { src = 'profile'; liveUpdate(); }
+               if($('#live-display').length) { 
+                       if(liking) {
+                               liking = 0;
+                               window.location.href=window.location.href 
+                       }
+               }
+               if($('#live-photos').length)  { 
+                       if(liking) {
+                               liking = 0;
+                               window.location.href=window.location.href 
+                       }
+               }
 
                if(! stopped) {
                        $.get("ping",function(data) {
@@ -89,13 +88,15 @@
 
        function liveUpdate() {
                if((src == null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; }
-               if($('.comment-edit-text-full').length) {
+               if(($('.comment-edit-text-full').length) || (in_progress)) {
                        livetime = setTimeout(liveUpdate, 10000);
                        return;
                }
                prev = 'live-' + src;
 
+               in_progress = true;
                $.get('update_' + src + '?p=' + profile_uid + '&msie=' + ((msie) ? 1 : 0),function(data) {
+                       in_progress = false;
                        $('.wall-item-outside-wrapper',data).each(function() {
                                var ident = $(this).attr('id');
                                if($('#' + ident).length == 0) { 
@@ -150,6 +151,7 @@
                $.get('like/' + ident.toString() + '?verb=' + verb );
                if(timer) clearTimeout(timer);
                timer = setTimeout(NavUpdate,3000);
+               liking = 1;
        }
 
        function getPosition(e) {