X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Fjs%2Fmain.js;h=3e0f8307a2b6b81123c4709f78e98e04cf0850ea;hb=969becfc157cded332756f78018a8d9935c9c88a;hp=4db78f6652827edb8c6675139428a30245e9f919;hpb=04caf1777298b9baaf92722b5b1698d342831400;p=friendica.git

diff --git a/view/js/main.js b/view/js/main.js
index 4db78f6652..3e0f8307a2 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -166,7 +166,7 @@ $(function() {
 
 	/* event from comment textarea button popups */
 	/* insert returned bbcode at cursor position or replace selected text */
-	$("body").on("fbrowser.image.comment", function(e, filename, bbcode, id) {
+	$('body').on('fbrowser.photo.comment', function(e, filename, bbcode, id) {
 		$.colorbox.close();
 		var textarea = document.getElementById("comment-edit-text-" +id);
 		var start = textarea.selectionStart;
@@ -239,7 +239,6 @@ $(function() {
 	});
 
 	/* notifications template */
-	var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
 	var notifications_all = unescape($('<div>').append($("#nav-notifications-see-all").clone()).html()); //outerHtml hack
 	var notifications_mark = unescape($('<div>').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('<span class="contactname">' + notification.name + '</span>');
-				var contact = ('<a href="' + notification.url + '"><span class="contactname">' + notification.name + '</span></a>');
-				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('&rarr; ', '').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
@@ -680,6 +665,8 @@ function doFollowThread(ident) {
 	$('#like-rotator-' + ident.toString()).show();
 	$.post('item/' + ident.toString() + '/follow', NavUpdate);
 	liking = 1;
+	force_update = true;
+	update_item = ident.toString();
 }
 
 function doStar(ident) {
@@ -959,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)
@@ -1082,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);
 	},
 
@@ -1099,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);
 	},
 
@@ -1108,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() {