X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=838b66981061661a51ed777b674169d3db01c4f5;hb=694ab9e6059ad2db8e72efc01b9acddf89bb3fa3;hp=d58f17f6c700b1d2bed3cf597aa6695117ec5960;hpb=547961e6345f8f6792b8ec9a95120a10c606be0b;p=Sone.git

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index d58f17f..838b669 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -146,7 +146,7 @@ function filterSoneId(soneId) {
  * @param lastUpdated
  *            The date and time of the last update (formatted for display)
  */
-function updateSoneStatus(soneId, name, status, modified, locked, lastUpdated) {
+function updateSoneStatus(soneId, name, status, modified, locked, lastUpdated, lastUpdatedText) {
 	$("#sone .sone." + filterSoneId(soneId)).
 		toggleClass("unknown", status == "unknown").
 		toggleClass("idle", status == "idle").
@@ -156,7 +156,7 @@ function updateSoneStatus(soneId, name, status, modified, locked, lastUpdated) {
 	$("#sone .sone." + filterSoneId(soneId) + " .lock").toggleClass("hidden", locked);
 	$("#sone .sone." + filterSoneId(soneId) + " .unlock").toggleClass("hidden", !locked);
 	if (lastUpdated != null) {
-		$("#sone .sone." + filterSoneId(soneId) + " .last-update span.time").text(lastUpdated);
+		$("#sone .sone." + filterSoneId(soneId) + " .last-update span.time").attr("title", lastUpdated).text(lastUpdatedText);
 	} else {
 		getTranslation("View.Sone.Text.UnknownDate", function(unknown) {
 			$("#sone .sone." + filterSoneId(soneId) + " .last-update span.time").text(unknown);
@@ -277,7 +277,7 @@ function getFormPassword() {
  */
 function getSone(soneId) {
 	return $("#sone .sone").filter(function(index) {
-		return $(".id").text() == soneId;
+		return $(".id", this).text() == soneId;
 	});
 }
 
@@ -416,6 +416,17 @@ function getNotificationId(notificationElement) {
 	return $(notificationElement).attr("id");
 }
 
+/**
+ * Returns the time the notification was last updated.
+ *
+ * @param notificationElement
+ *            The notification element
+ * @returns The last update time of the notification
+ */
+function getNotificationLastUpdatedTime(notificationElement) {
+	return $(notificationElement).attr("lastUpdatedTime");
+}
+
 function likePost(postId) {
 	$.getJSON("like.ajax", { "type": "post", "post" : postId, "formPassword": getFormPassword() }, function(data, textStatus) {
 		if ((data == null) || !data.success) {
@@ -758,7 +769,7 @@ function ajaxifyPost(postElement) {
 	});
 
 	/* add “comment” link. */
-	addCommentLink(getPostId(postElement), getPostAuthor(postElement), postElement, $(postElement).find(".post-status-line .time"));
+	addCommentLink(getPostId(postElement), getPostAuthor(postElement), postElement, $(postElement).find(".post-status-line .permalink-author"));
 
 	/* process all replies. */
 	replyIds = [];
@@ -818,7 +829,7 @@ function ajaxifyReply(replyElement) {
 			});
 		});
 	})(replyElement);
-	addCommentLink(getPostId(replyElement), getReplyAuthor(replyElement), replyElement, $(replyElement).find(".reply-status-line .time"));
+	addCommentLink(getPostId(replyElement), getReplyAuthor(replyElement), replyElement, $(replyElement).find(".reply-status-line .permalink-author"));
 
 	/* convert “show source” link into javascript function. */
 	$(replyElement).find(".show-reply-source").each(function() {
@@ -867,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");
 			}
 		}
 	});
@@ -912,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);
@@ -967,11 +978,11 @@ function checkForRemovedReplies(oldNotification, newNotification) {
 }
 
 function getStatus() {
-	$.getJSON("getStatus.ajax", {"loadAllSones": isKnownSonesPage()}, function(data, textStatus) {
+	$.getJSON("getStatus.ajax", isViewSonePage() ? {"soneIds": getShownSoneId() } : {"loadAllSones": isKnownSonesPage()}, function(data, textStatus) {
 		if ((data != null) && data.success) {
 			/* process Sone information. */
 			$.each(data.sones, function(index, value) {
-				updateSoneStatus(value.id, value.name, value.status, value.modified, value.locked, value.lastUpdatedUnknown ? null : value.lastUpdated);
+				updateSoneStatus(value.id, value.name, value.status, value.modified, value.locked, value.lastUpdatedUnknown ? null : value.lastUpdated, value.lastUpdatedText);
 			});
 			/* search for removed notifications. */
 			$("#sone #notification-area .notification").each(function() {
@@ -985,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);
 						});
@@ -1010,25 +1021,16 @@ function getStatus() {
 				}
 			});
 			/* process notifications. */
+			notificationIds = [];
 			$.each(data.notifications, function(index, value) {
 				oldNotification = getNotification(value.id);
-				notification = ajaxifyNotification(createNotification(value.id, value.text, value.dismissable)).hide();
-				if (oldNotification.length != 0) {
-					if ((oldNotification.find(".short-text").length > 0) && (notification.find(".short-text").length > 0)) {
-						opened = oldNotification.is(":visible") && oldNotification.find(".short-text").hasClass("hidden");
-						notification.find(".short-text").toggleClass("hidden", opened);
-						notification.find(".text").toggleClass("hidden", !opened);
-					}
-					checkForRemovedSones(oldNotification, notification);
-					checkForRemovedPosts(oldNotification, notification);
-					checkForRemovedReplies(oldNotification, notification);
-					oldNotification.replaceWith(notification.show());
-				} else {
-					$("#sone #notification-area").append(notification);
-					notification.slideDown();
-					setActivity();
+				if ((oldNotification.length == 0) || (value.lastUpdatedTime > getNotificationLastUpdatedTime(oldNotification))) {
+					notificationIds.push(value.id);
 				}
 			});
+			if (notificationIds.length > 0) {
+				loadNotifications(notificationIds);
+			}
 			/* process new posts. */
 			$.each(data.newPosts, function(index, value) {
 				loadNewPost(value.id, value.sone, value.recipient, value.time);
@@ -1050,6 +1052,40 @@ function getStatus() {
 }
 
 /**
+ * Requests multiple notifications from Sone and displays them.
+ *
+ * @param notificationIds
+ *            Array of IDs of the notifications to load
+ */
+function loadNotifications(notificationIds) {
+	$.getJSON("getNotification.ajax", {"notifications": notificationIds.join(",")}, function(data, textStatus) {
+		if (!data || !data.success) {
+			// TODO - show error
+			return;
+		}
+		$.each(data.notifications, function(index, value) {
+			oldNotification = getNotification(value.id);
+			notification = ajaxifyNotification(createNotification(value.id, value.lastUpdatedTime, value.text, value.dismissable)).hide();
+			if (oldNotification.length != 0) {
+				if ((oldNotification.find(".short-text").length > 0) && (notification.find(".short-text").length > 0)) {
+					opened = oldNotification.is(":visible") && oldNotification.find(".short-text").hasClass("hidden");
+					notification.find(".short-text").toggleClass("hidden", opened);
+					notification.find(".text").toggleClass("hidden", !opened);
+				}
+				checkForRemovedSones(oldNotification, notification);
+				checkForRemovedPosts(oldNotification, notification);
+				checkForRemovedReplies(oldNotification, notification);
+				oldNotification.replaceWith(notification.show());
+			} else {
+				$("#sone #notification-area").append(notification);
+				notification.slideDown();
+				setActivity();
+			}
+		})
+	});
+}
+
+/**
  * Returns the ID of the currently logged in Sone.
  *
  * @return The ID of the current Sone, or an empty string if no Sone is logged
@@ -1079,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”
@@ -1156,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;
@@ -1171,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;
@@ -1244,11 +1296,10 @@ function loadNewReply(replyId, soneId, postId, postSoneId) {
  *            request
  */
 function markSoneAsKnown(soneElement, skipRequest) {
-	if ($(".new", soneElement).length > 0) {
-		if ((typeof skipRequest != "undefined") && !skipRequest) {
-			$.getJSON("maskAsKnown.ajax", {"formPassword": getFormPassword(), "type": "sone", "id": getSoneId(soneElement)}, function(data, textStatus) {
-				$(soneElement).removeClass("new");
-			});
+	if ($(soneElement).is(".new")) {
+		$(soneElement).removeClass("new");
+		if ((typeof skipRequest == "undefined") || !skipRequest) {
+			$.getJSON("markAsKnown.ajax", {"formPassword": getFormPassword(), "type": "sone", "id": getSoneId(soneElement)});
 		}
 	}
 }
@@ -1440,8 +1491,8 @@ function changeIcon(iconUrl) {
  *            <code>true</code> if the notification can be dismissed by the
  *            user
  */
-function createNotification(id, text, dismissable) {
-	notification = $("<div></div>").addClass("notification").attr("id", id);
+function createNotification(id, lastUpdatedTime, text, dismissable) {
+	notification = $("<div></div>").addClass("notification").attr("id", id).attr("lastUpdatedTime", lastUpdatedTime);
 	if (dismissable) {
 		dismissForm = $("#sone #notification-area #notification-dismiss-template").clone().removeClass("hidden").removeAttr("id")
 		dismissForm.find("input[name=notification]").val(id);
@@ -1656,6 +1707,11 @@ $(document).ready(function() {
 		ajaxifyNotification($(this));
 	});
 
+	/* disable all permalinks. */
+	$(".permalink").click(function() {
+		return false;
+	});
+
 	/* activate status polling. */
 	setTimeout(getStatus, 5000);