diff options
| author | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2018-12-05 12:32:33 +0100 |
|---|---|---|
| committer | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2018-12-05 12:32:33 +0100 |
| commit | 4cd5529027efa19288ddce125f0d41ccb5519578 (patch) | |
| tree | 69b5bb1b43d807908d38d7febec21732fd334a49 /view/js | |
| parent | 5ac08ec3aa8ede14141390670a8097a60769e11e (diff) | |
| parent | d12744011affe7f6b79201442ad9fce6e083bdbb (diff) | |
| download | volse-hubzilla-4cd5529027efa19288ddce125f0d41ccb5519578.tar.gz volse-hubzilla-4cd5529027efa19288ddce125f0d41ccb5519578.tar.bz2 volse-hubzilla-4cd5529027efa19288ddce125f0d41ccb5519578.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/main.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js index 085bc8d0d..a69bcfa64 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -544,7 +544,7 @@ function handleNotificationsItems(notifyType, data) { notify_menu.html(''); $(data).each(function() { - 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,this.unseen,this.private_forum); + html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.addr,this.message,this.when,this.hclass,this.b64mid,this.notify_id,this.thread_top,this.unseen,this.private_forum); notify_menu.append(html); }); @@ -558,7 +558,8 @@ function handleNotificationsItems(notifyType, data) { if(filter) { $('#nav-' + notifyType + '-menu .notification').each(function(i, el){ var cn = $(el).data('contact_name').toString().toLowerCase(); - if(cn.indexOf(filter) === -1) + var ca = $(el).data('contact_addr').toString().toLowerCase(); + if(cn.indexOf(filter) === -1 && ca.indexOf(filter) === -1) $(el).addClass('d-none'); else $(el).removeClass('d-none'); |