diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2013-10-25 00:09:42 -0700 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2013-10-25 00:09:42 -0700 |
| commit | b23f3fc03b6bc751aab67fe2258a21f7c65bab8e (patch) | |
| tree | 84c997aa781afa566536ca5f66eb8f90ef468476 /js/main.js | |
| parent | d30f718e0836a031e43d5403480aa049561e736e (diff) | |
| parent | 0b0bd3c20765d267ec6d7cc261c7713917a22582 (diff) | |
| download | volse-hubzilla-b23f3fc03b6bc751aab67fe2258a21f7c65bab8e.tar.gz volse-hubzilla-b23f3fc03b6bc751aab67fe2258a21f7c65bab8e.tar.bz2 volse-hubzilla-b23f3fc03b6bc751aab67fe2258a21f7c65bab8e.zip | |
Merge pull request #3 from friendica/master
Align to main project HEAD
Diffstat (limited to 'js/main.js')
| -rw-r--r-- | js/main.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/js/main.js b/js/main.js index d5260a4be..79f11f424 100644 --- a/js/main.js +++ b/js/main.js @@ -98,6 +98,7 @@ function markRead(notifType) { $.get('ping?f=&markRead='+notifType); if(timer) clearTimeout(timer); + $('#' + notifType + '-update').html(''); timer = setTimeout(NavUpdate,2000); } @@ -137,7 +138,9 @@ e.tipTip({defaultPosition: pos, edgeOffset: 8}); });*/ - + var e = document.getElementById('content-complete'); + if(e) + pageHasMoreContent = false; /* setup onoff widgets */ $(".onoff input").each(function(){ @@ -573,7 +576,8 @@ function updateConvItems(mode,data) { updateConvItems(update_mode,data); $("#page-spinner").spin(false); $("#profile-jot-text-loading").spin(false); - + if(timer) clearTimeout(timer); + timer = setTimeout(NavUpdate,10); }); |