messages, popups disabled
diff --git a/public/js/startup.js b/public/js/startup.js
index c845ab2..4efc2a3 100644
--- a/public/js/startup.js
+++ b/public/js/startup.js
@@ -108,7 +108,7 @@
}
}
- show_in_circle('unread_messages', r.message.unread_messages.length);
+ show_in_circle('unread_messages', r.message.unread_messages);
show_in_circle('open_support_tickets', r.message.open_support_tickets);
show_in_circle('things_todo', r.message.things_todo);
show_in_circle('todays_events', r.message.todays_events);
diff --git a/public/js/toolbar.js b/public/js/toolbar.js
index a04c225..6b2ef9a 100644
--- a/public/js/toolbar.js
+++ b/public/js/toolbar.js
@@ -89,16 +89,9 @@
var navbar_nc = $('.navbar-new-comments');
if(wn.container.page && wn.container.page.page_name=="messages")
return;
- if(new_comments && new_comments.length>0) {
- navbar_nc.text(new_comments.length);
+ if(new_comments) {
+ navbar_nc.text(new_comments);
navbar_nc.addClass('navbar-new-comments-true')
- $.each(new_comments, function(i, v) {
- var msg = 'New Message: ' + (v[1].length<=100 ? v[1] : (v[1].substr(0, 100) + "..."));
- var id = v[0].replace('/', '-');
- if(!$('#' + id)[0]) {
- show_alert(msg).attr("id", id);
- }
- });
} else {
navbar_nc.removeClass('navbar-new-comments-true');
navbar_nc.text(0);