keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8168 from nupplaphil/bug/8165-notification-bubble

Browse source 
Fix Notification bubble
This commit is contained in:
Hypolite Petovan 2020-01-25 10:32:46 -05:00 committed by GitHub
commit 230bb6dd53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/ping.php
View file

@ -41,7 +41,7 @@ use Friendica\Util\XML;
* "birthdays-today": 0, * "birthdays-today": 0,
* "groups": [ ], * "groups": [ ],
* "forums": [ ], * "forums": [ ],
* "notify": 0, * "notification": 0,
* "notifications": [ ], * "notifications": [ ],
* "sysmsgs": { * "sysmsgs": {
* "notice": [ ], * "notice": [ ],
@ -351,7 +351,7 @@ function ping_init(App $a)
if ($format == 'json') { if ($format == 'json') {
$data['groups'] = $groups_unseen; $data['groups'] = $groups_unseen;
$data['forums'] = $forums_unseen; $data['forums'] = $forums_unseen;
$data['notify'] = $sysnotify_count + $intro_count + $register_count; $data['notification'] = $sysnotify_count + $intro_count + $register_count;
$data['notifications'] = $notifications; $data['notifications'] = $notifications;
$data['sysmsgs'] = [ $data['sysmsgs'] = [
'notice' => $sysmsgs, 'notice' => $sysmsgs,

4
view/js/main.js
View file

@ -245,7 +245,7 @@ $(function() {
window.location.href=window.location.href window.location.href=window.location.href
} }
['net', 'home', 'intro', 'mail', 'events', 'birthdays', 'notify'].forEach(function(type) { ['net', 'home', 'intro', 'mail', 'events', 'birthdays', 'notification'].forEach(function(type) {
var number = data[type]; var number = data[type];
if (number == 0) { if (number == 0) {
number = ''; number = '';
@ -349,7 +349,7 @@ $(function() {
}); });
} }
var notif = data['notify']; var notif = data['notification'];
if (notif > 0) { if (notif > 0) {
$("#nav-notifications-linkmenu").addClass("on"); $("#nav-notifications-linkmenu").addClass("on");
} else { } else {