X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Fjs%2Fmain.js;h=35a0529a0e0e7e118c71befc5a635a6c28349bfc;hb=d9658f42e7b7fb6630141c3f354ed59cfe98a6d1;hp=6ca0fabb86b0b34b1c8935783a86a7e6ef482f94;hpb=188720c3cd3d1f4a163bf5ee0ad603d25a8d0a1f;p=friendica.git

diff --git a/view/js/main.js b/view/js/main.js
index 6ca0fabb86..35a0529a0e 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -104,6 +104,20 @@ function decodeHtml(html) {
 	return txt.value;
 }
 
+/**
+ * Retrieves a single named query string parameter
+ *
+ * @param {string} name
+ * @returns {string}
+ * @see https://davidwalsh.name/query-string-javascript
+ */
+function getUrlParameter(name) {
+	name = name.replace(/[\[]/, '\\[').replace(/[\]]/, '\\]');
+	var regex = new RegExp('[\\?&]' + name + '=([^&#]*)');
+	var results = regex.exec(location.search);
+	return results === null ? '' : decodeURIComponent(results[1].replace(/\+/g, ' '));
+};
+
 var src = null;
 var prev = null;
 var livetime = null;
@@ -120,6 +134,7 @@ var commentBusy = false;
 var last_popup_menu = null;
 var last_popup_button = null;
 var lockLoadContent = false;
+var originalTitle = document.title;
 
 const urlRegex = /^(?:https?:\/\/|\s)[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})(?:\/+[a-z0-9_.:;-]*)*(?:\?[&%|+a-z0-9_=,.:;-]*)?(?:[&%|+&a-z0-9_=,:;.-]*)(?:[!#\/&%|+a-z0-9_=,:;.-]*)}*$/i;
 
@@ -160,23 +175,6 @@ $(function() {
 		$(textarea).trigger('change');
 	});
 
-	/* setup onoff widgets */
-	$(".onoff input").each(function() {
-		val = $(this).val();
-		id = $(this).attr("id");
-		$("#"+id+"_onoff ." + (val == 0 ? "on":"off")).addClass("hidden");
-	});
-
-	$(".onoff > a").click(function(event) {
-		event.preventDefault();
-		var input = $(this).siblings("input");
-		var val = 1-input.val();
-		var id = input.attr("id");
-		$("#"+id+"_onoff ." + (val == 0 ? "on":"off")).addClass("hidden");
-		$("#"+id+"_onoff ." + (val == 1 ? "on":"off")).removeClass("hidden");
-		input.val(val);
-	});
-
 	/* popup menus */
 	function close_last_popup_menu() {
 		if (last_popup_menu) {
@@ -245,7 +243,14 @@ $(function() {
 			window.location.href=window.location.href
 		}
 
-		['net', 'home', 'intro', 'mail', 'events', 'birthdays', 'notify'].forEach(function(type) {
+		let tabNotifications = data.mail + data.notification;
+		if (tabNotifications > 0) {
+			document.title = '(' + tabNotifications + ') ' + originalTitle;
+		} else {
+			document.title = originalTitle;
+		}
+
+		['net', 'home', 'intro', 'mail', 'events', 'birthdays', 'notification'].forEach(function(type) {
 			var number = data[type];
 			if (number == 0) {
 				number = '';
@@ -349,7 +354,7 @@ $(function() {
 			});
 		}
 
-		var notif = data['notify'];
+		var notif = data['notification'];
 		if (notif > 0) {
 			$("#nav-notifications-linkmenu").addClass("on");
 		} else {
@@ -528,7 +533,13 @@ function updateConvItems(data) {
 		var ident = $(this).attr('id');
 
 		// Add new top-level item.
-		if ($('#' + ident).length == 0 && profile_page == 1) {
+		if ($('#' + ident).length === 0
+			&& (!getUrlParameter('page')
+				&& !getUrlParameter('max_id')
+				&& !getUrlParameter('since_id')
+				|| getUrlParameter('page') === '1'
+			)
+		) {
 			$('#' + prev).after($(this));
 
 		// Replace already existing thread.
@@ -583,18 +594,30 @@ function liveUpdate(src) {
 
 	in_progress = true;
 
-	if ($(document).scrollTop() == 0) {
-		force_update = true;
-	}
+	let force = force_update || $(document).scrollTop() === 0;
 
 	var orgHeight = $("section").height();
 
 	var udargs = ((netargs.length) ? '/' + netargs : '');
-	var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&force=' + ((force_update) ? 1 : 0) + '&item=' + update_item;
 
-	$.get(update_url,function(data) {
-		in_progress = false;
+	var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&force=' + (force ? 1 : 0) + '&item=' + update_item;
+
+	if (force_update) {
 		force_update = false;
+	}
+
+	if (getUrlParameter('page')) {
+		update_url += '&page=' + getUrlParameter('page');
+	}
+	if (getUrlParameter('since_id')) {
+		update_url += '&since_id=' + getUrlParameter('since_id');
+	}
+	if (getUrlParameter('max_id')) {
+		update_url += '&max_id=' + getUrlParameter('max_id');
+	}
+
+	$.get(update_url, function(data) {
+		in_progress = false;
 		update_item = 0;
 
 		$('.wall-item-body', data).imagesLoaded(function() {
@@ -626,9 +649,15 @@ function imgdull(node) {
 // trickery. This still could cause confusion if the "like" ajax call
 // is delayed and NavUpdate runs before it completes.
 
-function dolike(ident,verb) {
+/**
+ * @param {int}     ident The id of the relevant item
+ * @param {string}  verb  The verb of the action
+ * @param {boolean} un    Whether to perform an activity removal instead of creation
+ */
+function dolike(ident, verb, un) {
 	unpause();
 	$('#like-rotator-' + ident.toString()).show();
+	verb = un ? 'un' + verb : verb;
 	$.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate);
 	liking = 1;
 	force_update = true;
@@ -721,26 +750,23 @@ function getPosition(e) {
 
 var lockvisible = false;
 
-function lockview(event,id) {
+function lockview(event, type, id) {
 	event = event || window.event;
 	cursor = getPosition(event);
 	if (lockvisible) {
-		lockviewhide();
+		lockvisible = false;
+		$('#panel').hide();
 	} else {
 		lockvisible = true;
-		$.get('lockview/' + id, function(data) {
-			$('#panel').html(data);
-			$('#panel').css({'left': cursor.x + 5 , 'top': cursor.y + 5});
-			$('#panel').show();
+		$.get('permission/tooltip/' + type + '/' + id, function(data) {
+			$('#panel')
+				.html(data)
+				.css({'left': cursor.x + 5 , 'top': cursor.y + 5})
+				.show();
 		});
 	}
 }
 
-function lockviewhide() {
-	lockvisible = false;
-	$('#panel').hide();
-}
-
 function post_comment(id) {
 	unpause();
 	commentBusy = true;
@@ -833,10 +859,6 @@ function loadScrollContent() {
 
 	$("#scroll-loader").fadeIn('normal');
 
-	// the page number to load is one higher than the actual
-	// page number
-	infinite_scroll.pageno+=1;
-
 	match = $("span.received").last();
 	if (match.length > 0) {
 		received = match[0].innerHTML;
@@ -858,16 +880,16 @@ function loadScrollContent() {
 		commented = "0000-00-00 00:00:00";
 	}
 
-	match = $("span.id").last();
+	match = $("span.uriid").last();
 	if (match.length > 0) {
-		id = match[0].innerHTML;
+		uriid = match[0].innerHTML;
 	} else {
-		id = "0";
+		uriid = "0";
 	}
 
 	// get the raw content from the next page and insert this content
 	// right before "#conversation-end"
-	$.get(infinite_scroll.reload_uri + '&mode=raw&last_received=' + received + '&last_commented=' + commented + '&last_created=' + created + '&last_id=' + id + '&page=' + infinite_scroll.pageno, function(data) {
+	$.get(infinite_scroll.reload_uri + '&mode=raw&last_received=' + received + '&last_commented=' + commented + '&last_created=' + created + '&last_uriid=' + uriid, function(data) {
 		$("#scroll-loader").hide();
 		if ($(data).length > 0) {
 			$(data).insertBefore('#conversation-end');
@@ -911,14 +933,6 @@ function groupChangeMember(gid, cid, sec_token) {
 	});
 }
 
-function profChangeMember(gid,cid) {
-	$('body .fakelink').css('cursor', 'wait');
-	$.get('profperm/' + gid + '/' + cid, function(data) {
-			$('#prof-update-wrapper').html(data);
-			$('body .fakelink').css('cursor', 'auto');
-	});
-}
-
 function contactgroupChangeMember(checkbox, gid, cid) {
 	let url;
 	// checkbox.checked is the checkbox state after the click