aboutsummaryrefslogtreecommitdiffstats
path: root/view/js/main.js
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-11-12 16:07:04 -0800
committerzotlabs <mike@macgirvin.com>2017-11-12 16:07:04 -0800
commit59caf141d1e271ee4a6e7ab8b66f4070835dde95 (patch)
tree44056bdac329f6356fa75ed3566c88568677d89f /view/js/main.js
parent71a30cd9a5f5c749e3b76e961876afbd0afa87f9 (diff)
parent6ea7ef43e0a0a99f81986c8e1fe5955800bfa496 (diff)
downloadvolse-hubzilla-59caf141d1e271ee4a6e7ab8b66f4070835dde95.tar.gz
volse-hubzilla-59caf141d1e271ee4a6e7ab8b66f4070835dde95.tar.bz2
volse-hubzilla-59caf141d1e271ee4a6e7ab8b66f4070835dde95.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/js/main.js')
-rw-r--r--view/js/main.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js
index ffea1b75c..e231dac60 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -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,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,this.b64mid);
$("#nav-" + notifyType + "-menu").append(html);
});