aboutsummaryrefslogtreecommitdiffstats
path: root/view/js/main.js
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-10-12 11:36:25 -0700
committerzotlabs <mike@macgirvin.com>2017-10-12 11:36:25 -0700
commite6c166a182f53be9abb819b9c8a80275fc815d29 (patch)
tree1bd47adb93b082c509a1fc6876b7be63972b663f /view/js/main.js
parent6acd96fd33038f0e3535af6861d1ba658098abc8 (diff)
downloadvolse-hubzilla-e6c166a182f53be9abb819b9c8a80275fc815d29.tar.gz
volse-hubzilla-e6c166a182f53be9abb819b9c8a80275fc815d29.tar.bz2
volse-hubzilla-e6c166a182f53be9abb819b9c8a80275fc815d29.zip
sort out the notification ids
Diffstat (limited to 'view/js/main.js')
-rw-r--r--view/js/main.js8
1 files changed, 7 insertions, 1 deletions
diff --git a/view/js/main.js b/view/js/main.js
index ea8d1a3ab..0aeb4d36d 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -963,7 +963,8 @@ function justifyPhotosAjax(id) {
function notify_popup_loader(notifyType) {
- /* notifications template */
+ /* notifications template - different for navbar and notifications widget */
+ var navbar_notifications_tpl= unescape($("#navbar-notifications-template[rel=template]").html());
var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
var notifications_all = unescape($('<div>').append( $("#nav-" + notifyType + "-see-all").clone() ).html()); //outerHtml hack
var notifications_mark = unescape($('<div>').append( $("#nav-" + notifyType + "-mark-all").clone() ).html()); //outerHtml hack
@@ -979,11 +980,16 @@ function notify_popup_loader(notifyType) {
}
if(data.notify.length == 0){
+ $("#navbar-" + notifyType + "-menu").html(aStr[nothingnew]);
$("#nav-" + notifyType + "-menu").html(aStr[nothingnew]);
} else {
+ $("#navbar-" + notifyType + "-menu").html(notifications_all + notifications_mark);
$("#nav-" + notifyType + "-menu").html(notifications_all + notifications_mark);
$(data.notify).each(function() {
+ html = navbar_notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass);
+ $("#navbar-" + notifyType + "-menu").append(html);
+
html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass);
$("#nav-" + notifyType + "-menu").append(html);
});