aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-01-18 12:44:40 +0100
committerMario Vavti <mario@mariovavti.com>2018-01-18 12:44:40 +0100
commit53e353abf2abe43b14f05fbf38e232a68f0689ad (patch)
treed1d31376891b989a2f9ec33cf88fc6bade4a218b /view/js
parent23a20ba6a549aacd637606857147a4949f5637fe (diff)
downloadvolse-hubzilla-53e353abf2abe43b14f05fbf38e232a68f0689ad.tar.gz
volse-hubzilla-53e353abf2abe43b14f05fbf38e232a68f0689ad.tar.bz2
volse-hubzilla-53e353abf2abe43b14f05fbf38e232a68f0689ad.zip
consolidate navbar tucson and some javascript cleanup
Diffstat (limited to 'view/js')
-rw-r--r--view/js/main.js15
1 files changed, 2 insertions, 13 deletions
diff --git a/view/js/main.js b/view/js/main.js
index 52b836936..0e3dcb0ec 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -878,18 +878,10 @@ function justifyPhotosAjax(id) {
function notify_popup_loader(notifyType) {
- /* 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
- //var notifications_tt_only = unescape($('<div>').append( $("#tt-" + notifyType + "-only").clone() ).html()); //outerHtml hack
- //var notifications_cn_only = unescape($('<div>').append( $("#cn-" + notifyType + "-only").clone() ).html()); //outerHtml hack
- //var notifications_empty = unescape($("#nav-" + notifyType + "-menu").html());
-
var notify_menu = $("#nav-" + notifyType + "-menu");
-
var pingExCmd = 'ping/' + notifyType + ((localUser != 0) ? '?f=&uid=' + localUser : '');
+
$.get(pingExCmd, function(data) {
if(data.invalid == 1) {
@@ -904,10 +896,8 @@ function notify_popup_loader(notifyType) {
notify_menu.html('');
$(data.notify).each(function() {
- html = navbar_notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass,this.b64mid,this.notify_id,this.thread_top);
- $("#navbar-" + notifyType + "-menu").append(html);
html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass,this.b64mid,this.notify_id,this.thread_top);
- $("#nav-" + notifyType + "-menu").append(html);
+ notify_menu.append(html);
});
$(".dropdown-menu img[data-src], .notification img[data-src]").each(function(i, el){
@@ -920,7 +910,6 @@ function notify_popup_loader(notifyType) {
$('#nav-' + notifyType + '-menu [data-thread_top=false]').hide();
var filter = $('#cn-' + notifyType + '-input').val();
-
if(filter) {
$('#nav-' + notifyType + '-menu .notification').each(function(i, el){
var cn = $(el).data('contact_name').toLowerCase();