X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=d21e6c691fa322381840333fcea7012d77b82f3c;hb=a6c5169b296db74bc7181e29818fa0068c535584;hp=7c3a0645c38cc647fa3082575fb885c7e37c7a89;hpb=400a459052ed5a102142944fe9386c9d25438be4;p=Sone.git

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index 7c3a064..d21e6c6 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -878,7 +878,7 @@ function ajaxifyNotification(notification) {
 		if (linkElement.is("[href^='viewPost']")) {
 			id = linkElement.attr("class").substr(5);
 			if (hasPost(id)) {
-				linkElement.attr("href", "#post-" + id);
+				linkElement.attr("href", "#post-" + id).addClass("in-page-link");
 			}
 		}
 	});
@@ -923,8 +923,8 @@ function checkForRemovedSones(oldNotification, newNotification) {
 	if (getNotificationId(oldNotification) != "new-sone-notification") {
 		return;
 	}
-	oldIds = getElementIds(oldNotification, ".sone-id");
-	newIds = getElementIds(newNotification, ".sone-id");
+	oldIds = getElementIds(oldNotification, ".new-sone-id");
+	newIds = getElementIds(newNotification, ".new-sone-id");
 	$.each(oldIds, function(index, value) {
 		if ($.inArray(value, newIds) == -1) {
 			markSoneAsKnown(getSone(value), true);
@@ -996,7 +996,7 @@ function getStatus() {
 				});
 				if (!foundNotification) {
 					if (notificationId == "new-sone-notification") {
-						$(".sone-id", this).each(function(index, element) {
+						$(".new-sone-id", this).each(function(index, element) {
 							soneId = $(this).text();
 							markSoneAsKnown(getSone(soneId), true);
 						});
@@ -1115,6 +1115,22 @@ function isIndexPage() {
 }
 
 /**
+ * Returns the current page of the selected pagination. If no pagination can be
+ * found with the given selector, {@code 1} is returned.
+ *
+ * @param paginationSelector
+ *            The pagination selector
+ * @returns The current page of the pagination
+ */
+function getPage(paginationSelector) {
+	pagination = $(paginationSelector);
+	if (pagination.length > 0) {
+		return $(".current-page", paginationSelector).text();
+	}
+	return 1;
+}
+
+/**
  * Returns whether the current page is a “view Sone” page.
  *
  * @returns {Boolean} <code>true</code> if the current page is a “view Sone”
@@ -1192,7 +1208,7 @@ function loadNewPost(postId, soneId, recipientId, time) {
 	if (hasPost(postId)) {
 		return;
 	}
-	if (!isIndexPage()) {
+	if (!isIndexPage() || (getPage(".pagination-index") > 1)) {
 		if (!isViewPostPage() || (getShownPostId() != postId)) {
 			if (!isViewSonePage() || ((getShownSoneId() != soneId) && (getShownSoneId() != recipientId))) {
 				return;
@@ -1207,7 +1223,7 @@ function loadNewPost(postId, soneId, recipientId, time) {
 			if (hasPost(data.post.id)) {
 				return;
 			}
-			if (!isIndexPage() && !(isViewSonePage() && ((getShownSoneId() == data.post.sone) || (getShownSoneId() == data.post.recipient)))) {
+			if ((!isIndexPage() || (getPage(".pagination-index") > 1)) && !(isViewSonePage() && ((getShownSoneId() == data.post.sone) || (getShownSoneId() == data.post.recipient)))) {
 				return;
 			}
 			var firstOlderPost = null;