aboutsummaryrefslogtreecommitdiffstats
path: root/js/main.js
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-11-12 04:12:03 -0800
committerFriendika <info@friendika.com>2011-11-12 04:12:03 -0800
commit58ba7c3969ce51d0f0f67d602886035230c1f3ae (patch)
treed1afcb0fda4964176743d129ace2dc9ad8bd3906 /js/main.js
parentcf82174520c4cc1024f2690e51dc903d663a5661 (diff)
parentab6bf767df4a06494b314f7d0c3928a795b81bae (diff)
downloadvolse-hubzilla-58ba7c3969ce51d0f0f67d602886035230c1f3ae.tar.gz
volse-hubzilla-58ba7c3969ce51d0f0f67d602886035230c1f3ae.tar.bz2
volse-hubzilla-58ba7c3969ce51d0f0f67d602886035230c1f3ae.zip
Merge branch 'pull'
Diffstat (limited to 'js/main.js')
-rw-r--r--js/main.js41
1 files changed, 24 insertions, 17 deletions
diff --git a/js/main.js b/js/main.js
index 15c5b5d1f..9832b2cbc 100644
--- a/js/main.js
+++ b/js/main.js
@@ -168,28 +168,35 @@
function NavUpdate() {
- if($('#live-network').length) { src = 'network'; liveUpdate(); }
- if($('#live-profile').length) { src = 'profile'; liveUpdate(); }
- if($('#live-community').length) { src = 'community'; liveUpdate(); }
- if($('#live-notes').length) { src = 'notes'; 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) {
$(data).find('result').each(function() {
// send nav-update event
$('nav').trigger('nav-update', this);
+
+
+ // start live update
+
+ if($('#live-network').length) { src = 'network'; liveUpdate(); }
+ if($('#live-profile').length) { src = 'profile'; liveUpdate(); }
+ if($('#live-community').length) { src = 'community'; liveUpdate(); }
+ if($('#live-notes').length) { src = 'notes'; 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
+ }
+ }
+
+
+
+
});
}) ;
}