aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-11-10 20:30:55 +0100
committerMario <mario@mariovavti.com>2017-11-11 20:28:00 +0100
commitebee3e208c0f0bb8c6b84d05a4c9005bf229f054 (patch)
tree8d1f7f7672dbef7355b79d64abb23976844e7bad /view
parentf8cf68ab53f4a287162db556568f8e651f8d42a1 (diff)
downloadvolse-hubzilla-ebee3e208c0f0bb8c6b84d05a4c9005bf229f054.tar.gz
volse-hubzilla-ebee3e208c0f0bb8c6b84d05a4c9005bf229f054.tar.bz2
volse-hubzilla-ebee3e208c0f0bb8c6b84d05a4c9005bf229f054.zip
revert back to get the mid from enotify - otherwise we can not distinct between posts and likes
Diffstat (limited to 'view')
-rw-r--r--view/js/main.js4
-rw-r--r--view/tpl/notifications_widget.tpl8
2 files changed, 6 insertions, 6 deletions
diff --git a/view/js/main.js b/view/js/main.js
index ffea1b75c..e231dac60 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);
+ html = navbar_notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass,this.b64mid);
$("#navbar-" + notifyType + "-menu").append(html);
- html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass);
+ html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass,this.b64mid);
$("#nav-" + notifyType + "-menu").append(html);
});
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 1e752c313..0ece84891 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -29,16 +29,16 @@
{{if $module == 'display'}}
<script>
$(document).on('click', '.notification', function(e) {
- var mid = $(this)[0].pathname.substr(9);
+ var b64mid = $(this).data('b64mid');
var path = $(this)[0].pathname.substr(1,7);
- if(path === 'display' && mid) {
+ if(path === 'display' && b64mid) {
e.preventDefault();
e.stopPropagation();
$('.thread-wrapper').remove();
$(this).fadeOut();
- bParam_mid = mid;
+ bParam_mid = b64mid;
mode = 'replace';
page_load = true;
liveUpdate();
@@ -54,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}">
+ <a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}" data-b64mid="{6}">
<img class="menu-img-3" data-src="{1}">
<span class="contactname">{2}</span>
<span class="dropdown-sub-text">{3}<br>{4}</span>