').append($("#nav-notifications-see-all").clone()).html()); //outerHtml hack
var notifications_mark = unescape($('
').append($("#nav-notifications-mark-all").clone()).html()); //outerHtml hack
var notifications_empty = unescape($("#nav-notifications-menu").html());
@@ -290,18 +289,18 @@ $(function() {
$('#mail-update-li').html(mail);
- $(".sidebar-group-li .notify").removeClass("show");
- $(data.groups).each(function(key, group) {
- var gid = group.id;
- var gcount = group.count;
- $(".group-"+gid+" .notify").addClass("show").text(gcount);
+ $(".sidebar-circle-li .notify").removeClass("show");
+ $(data.circles).each(function(key, circle) {
+ var gid = circle.id;
+ var gcount = circle.count;
+ $(".circle-"+gid+" .notify").addClass("show").text(gcount);
});
- $(".forum-widget-entry .notify").removeClass("show");
- $(data.forums).each(function(key, forum) {
- var fid = forum.id;
- var fcount = forum.count;
- $(".forum-"+fid+" .notify").addClass("show").text(fcount);
+ $(".group-widget-entry .notify").removeClass("show");
+ $(data.groups).each(function(key, group) {
+ var fid = group.id;
+ var fcount = group.count;
+ $(".group-"+fid+" .notify").addClass("show").text(fcount);
});
if (data.notifications.length == 0) {
@@ -315,34 +314,20 @@ $(function() {
var notification_id = 0;
// Insert notifs into the notifications-menu
- $(data.notifications).each(function(key, notification) {
- var text = notification.message.format('
' + notification.name + '');
- var contact = ('
' + notification.name + '');
- var seenclass = (notification.seen == 1) ? "notification-seen" : "notification-unseen";
- var html = notifications_tpl.format(
- notification.href, // {0} // link to the source
- notification.photo, // {1} // photo of the contact
- text, // {2} // preformatted text (autor + text)
- notification.date, // {3} // date of notification (time ago)
- seenclass, // {4} // visited status of the notification
- new Date(notification.timestamp*1000), // {5} // date of notification
- notification.url, // {6} // profile url of the contact
- notification.message.format(contact), // {7} // preformatted html (text including author profile url)
- '' // {8} // Deprecated
- );
- nnm.append(html);
+ $(data.notifications).each(function(key, navNotif) {
+ nnm.append(navNotif.html);
});
// Desktop Notifications
- $(data.notifications.reverse()).each(function(key, e) {
- notification_id = parseInt(e.timestamp);
- if (notification_lastitem !== null && notification_id > notification_lastitem && Number(e.seen) === 0) {
+ $(data.notifications.reverse()).each(function(key, navNotif) {
+ notification_id = parseInt(navNotif.timestamp);
+ if (notification_lastitem !== null && notification_id > notification_lastitem && Number(navNotif.seen) === 0) {
if (getNotificationPermission() === "granted") {
var notification = new Notification(document.title, {
- body: decodeHtml(e.message.replace('→ ', '').format(e.name)),
- icon: e.photo,
- });
- notification['url'] = e.href;
+ body: decodeHtml(navNotif.plaintext),
+ icon: navNotif.contact.photo,
+ });
+ notification['url'] = navNotif.href;
notification.addEventListener("click", function(ev) {
window.location = ev.target.url;
});
@@ -514,7 +499,7 @@ function insertBBCodeInTextarea(BBCode, textarea) {
function NavUpdate() {
if (!stopped) {
- var pingCmd = 'ping?format=json' + ((localUser != 0) ? '&uid=' + localUser : '');
+ var pingCmd = 'ping';
$.get(pingCmd, function(data) {
if (data.result) {
// send nav-update event
@@ -961,21 +946,21 @@ function bin2hex(s) {
return a.join('');
}
-function groupChangeMember(gid, cid, sec_token) {
+function circleChangeMember(gid, cid, sec_token) {
$('body .fakelink').css('cursor', 'wait');
- $.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) {
- $('#group-update-wrapper').html(data);
+ $.get('circle/' + gid + '/' + cid + "?t=" + sec_token, function(data) {
+ $('#circle-update-wrapper').html(data);
$('body .fakelink').css('cursor', 'auto');
});
}
-function contactgroupChangeMember(checkbox, gid, cid) {
+function contactCircleChangeMember(checkbox, gid, cid) {
let url;
// checkbox.checked is the checkbox state after the click
if (checkbox.checked) {
- url = 'group/' + gid + '/add/' + cid;
+ url = 'circle/' + gid + '/add/' + cid;
} else {
- url = 'group/' + gid + '/remove/' + cid;
+ url = 'circle/' + gid + '/remove/' + cid;
}
$('body').css('cursor', 'wait');
$.post(url)
@@ -1084,7 +1069,7 @@ var Dialog = {
* to the event handler
*/
doImageBrowser : function (name, id) {
- var url = Dialog._get_url("image",name,id);
+ var url = Dialog._get_url('photo', name, id);
return Dialog.show(url);
},
@@ -1101,7 +1086,7 @@ var Dialog = {
* to the event handler
*/
doFileBrowser : function (name, id) {
- var url = Dialog._get_url("file",name,id);
+ var url = Dialog._get_url('attachment', name, id);
return Dialog.show(url);
},
@@ -1110,7 +1095,7 @@ var Dialog = {
if (id !== undefined) {
hash = hash + "-" + id;
}
- return baseurl + "/fbrowser/"+type+"/?mode=minimal#"+hash;
+ return 'media/' + type + '/browser?mode=minimal#' + hash;
},
_get_size: function() {