diff options
| author | friendica <info@friendica.com> | 2011-12-12 20:13:12 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2011-12-12 20:13:12 -0800 |
| commit | ed725df5f1c1ea2484c689283e93f8f825591384 (patch) | |
| tree | 289183e66da097acfeaeb0c7bfe9099a87a5a86a /js/main.js | |
| parent | 50c4b9a7803c08d6e41fc64ca3ffeb66c7f450ba (diff) | |
| parent | ee4975f1cd9f205e2300f3e22e51079c5e26f155 (diff) | |
| download | volse-hubzilla-ed725df5f1c1ea2484c689283e93f8f825591384.tar.gz volse-hubzilla-ed725df5f1c1ea2484c689283e93f8f825591384.tar.bz2 volse-hubzilla-ed725df5f1c1ea2484c689283e93f8f825591384.zip | |
Merge branch 'master' into notify
Diffstat (limited to 'js/main.js')
| -rw-r--r-- | js/main.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/js/main.js b/js/main.js index 829af2258..3f84ae6c4 100644 --- a/js/main.js +++ b/js/main.js @@ -204,15 +204,21 @@ }); }) ; } - timer = setTimeout(NavUpdate,30000); + timer = setTimeout(NavUpdate,updateInterval); } function liveUpdate() { if((src == null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; } if(($('.comment-edit-text-full').length) || (in_progress)) { + if(livetime) { + clearTimeout(livetime); + } livetime = setTimeout(liveUpdate, 10000); return; } + if(livetime != null) + livetime = null; + prev = 'live-' + src; in_progress = true; @@ -235,7 +241,7 @@ $('.tread-wrapper',data).each(function() { var ident = $(this).attr('id'); - if($('#' + ident).length == 0) { + if($('#' + ident).length == 0 && profile_page == 1) { $('img',this).each(function() { $(this).attr('src',$(this).attr('dst')); }); |