diff options
| author | root <root@diekershoff.homeunix.net> | 2010-12-16 11:28:51 +0100 |
|---|---|---|
| committer | root <root@diekershoff.homeunix.net> | 2010-12-16 11:28:51 +0100 |
| commit | 79ab5b2ff87ef171a9baf604179080861d64d788 (patch) | |
| tree | 402d50aa88de4dfddb46258f1cca6d86833d79cd /include | |
| parent | 961a0c13c7fb257f356b9a67b1b0f3dd32bfc80c (diff) | |
| parent | df2e79dcaf28810e31d4bdc48bdb76e12f70e817 (diff) | |
| download | volse-hubzilla-79ab5b2ff87ef171a9baf604179080861d64d788.tar.gz volse-hubzilla-79ab5b2ff87ef171a9baf604179080861d64d788.tar.bz2 volse-hubzilla-79ab5b2ff87ef171a9baf604179080861d64d788.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'include')
| -rw-r--r-- | include/main.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/main.js b/include/main.js index 1b5553161..ef6b059cc 100644 --- a/include/main.js +++ b/include/main.js @@ -25,6 +25,7 @@ var timer = null; var pr = 0; var liking = 0; + var in_progress = false; $(document).ready(function() { $.ajaxSetup({cache: false}); @@ -87,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) { |