X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=8065b73d6da01d59fe1011c93eea5593a70822be;hb=403bcebd8de71dcb793c3f15138bc2df6431ae06;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..8065b73 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);
@@ -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) {
@@ -971,7 +982,7 @@ function getStatus() {
 		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() {
@@ -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
@@ -1440,8 +1476,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);