diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-11-09 12:41:57 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-11-09 12:41:57 +0100 |
| commit | 40a7446e3e1d52fa015ac9f2ce45b0c2b8df520f (patch) | |
| tree | 6b068400f924c1bc2595932f65fc1970d7f0fc35 | |
| parent | fc96cd371042a92ed180635b91924413392d3972 (diff) | |
| download | volse-hubzilla-40a7446e3e1d52fa015ac9f2ce45b0c2b8df520f.tar.gz volse-hubzilla-40a7446e3e1d52fa015ac9f2ce45b0c2b8df520f.tar.bz2 volse-hubzilla-40a7446e3e1d52fa015ac9f2ce45b0c2b8df520f.zip | |
get the path infos from pathname instead of seperate data attribute
| -rw-r--r-- | Zotlabs/Lib/Enotify.php | 1 | ||||
| -rw-r--r-- | view/js/main.js | 4 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 11 |
3 files changed, 7 insertions, 9 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index fffe4ffe7..d5798e671 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -803,7 +803,6 @@ class Enotify { 'photo' => $item['author']['xchan_photo_s'], 'when' => relative_date($item['created']), 'class' => (intval($item['item_unseen']) ? 'notify-unseen' : 'notify-seen'), - 'b64mid' => 'b64.' . base64url_encode($item['mid']), 'message' => strip_tags(bbcode($itemem_text)) ); diff --git a/view/js/main.js b/view/js/main.js index 4cc10bb49..ffea1b75c 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -959,9 +959,9 @@ function notify_popup_loader(notifyType) { $("." + notifyType + "-update").html(data.notify.length); $(data.notify).each(function() { - html = navbar_notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass,notifyType == 'pubs' ? 'undefined' : this.b64mid); + 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,notifyType == 'pubs' ? 'undefined' : this.b64mid); + html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass); $("#nav-" + notifyType + "-menu").append(html); }); diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index dd4cc6377..1e752c313 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -29,17 +29,16 @@ {{if $module == 'display'}} <script> $(document).on('click', '.notification', function(e) { - var b64mid = $(this).data('b64mid'); + var mid = $(this)[0].pathname.substr(9); + var path = $(this)[0].pathname.substr(1,7); - console.log(b64mid); - - if(b64mid !== 'undefined') { + if(path === 'display' && mid) { e.preventDefault(); e.stopPropagation(); $('.thread-wrapper').remove(); $(this).fadeOut(); - bParam_mid = b64mid; + bParam_mid = mid; mode = 'replace'; page_load = true; liveUpdate(); @@ -55,7 +54,7 @@ <div id="notifications_wrapper"> <div id="notifications" class="navbar-nav" data-children=".nav-item"> <div id="nav-notifications-template" rel="template"> - <a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}" data-b64mid="{6}"> + <a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}"> <img class="menu-img-3" data-src="{1}"> <span class="contactname">{2}</span> <span class="dropdown-sub-text">{3}<br>{4}</span> |