diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-11-09 11:34:41 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-11-09 11:34:41 +0100 |
| commit | fc96cd371042a92ed180635b91924413392d3972 (patch) | |
| tree | 19cbe2aaee6d625df3ab5dcd2c60d7ceec074070 /view/js | |
| parent | e7d20efb1b8d579bcb9bdef99205aad19281f6b2 (diff) | |
| download | volse-hubzilla-fc96cd371042a92ed180635b91924413392d3972.tar.gz volse-hubzilla-fc96cd371042a92ed180635b91924413392d3972.tar.bz2 volse-hubzilla-fc96cd371042a92ed180635b91924413392d3972.zip | |
load notifications links to /display via ajax if we are already in /display
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/main.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/view/js/main.js b/view/js/main.js index c3873d823..4cc10bb49 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -750,6 +750,7 @@ function collapseHeight() { } function liveUpdate() { + if(typeof profile_uid === 'undefined') profile_uid = false; /* Should probably be unified with channelId defined in head.tpl */ if((src === null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; } if(($('.comment-edit-text.expanded').length) || (in_progress)) { @@ -791,7 +792,6 @@ function liveUpdate() { var orgHeight = $("#region_2").height(); } - var dstart = new Date(); console.log('LOADING data...'); $.get(update_url, function(data) { @@ -959,9 +959,9 @@ function notify_popup_loader(notifyType) { $("." + notifyType + "-update").html(data.notify.length); $(data.notify).each(function() { - html = navbar_notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass); + html = navbar_notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass,notifyType == 'pubs' ? 'undefined' : this.b64mid); $("#navbar-" + notifyType + "-menu").append(html); - html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass); + html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass,notifyType == 'pubs' ? 'undefined' : this.b64mid); $("#nav-" + notifyType + "-menu").append(html); }); |