diff options
author | Mario Vavti <mario@mariovavti.com> | 2018-12-02 09:58:54 +0000 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2018-12-02 10:59:33 +0100 |
commit | f13b1e8604746d9e3269f1678ca7ed6d1e7c5b6f (patch) | |
tree | f57bb9b495c9df2987ab67a01967f26ea6e5c8cd | |
parent | 52424b0f9c14b6f1c58d963df0479332520be4ef (diff) | |
download | volse-hubzilla-f13b1e8604746d9e3269f1678ca7ed6d1e7c5b6f.tar.gz volse-hubzilla-f13b1e8604746d9e3269f1678ca7ed6d1e7c5b6f.tar.bz2 volse-hubzilla-f13b1e8604746d9e3269f1678ca7ed6d1e7c5b6f.zip |
fix filtering by addr in handleNotificationsItems()
(cherry picked from commit f083c0cba10248926661db42d99d04b5eb7579e8)
-rw-r--r-- | view/js/main.js | 3 | ||||
-rw-r--r-- | view/tpl/notifications_widget.tpl | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js index f4bfd413b..a69bcfa64 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -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'); diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index e38356597..c88ab827c 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -135,7 +135,7 @@ {{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span> </div> <div id="nav-notifications-template" rel="template"> - <a class="list-group-item clearfix notification {6}" href="{0}" title="{2}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}"> + <a class="list-group-item clearfix notification {6}" href="{0}" title="{3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}"> <img class="menu-img-3" data-src="{1}"> <span class="contactname">{2}</span> <span class="dropdown-sub-text">{4}<br>{5}</span> |