X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=5aaa6a5f4b54df3593346a7e8ee53ce6323497f0;hb=85fd1173da553ee8c1afbe0c4638cc9bbce8d44f;hp=d60ee230157664d7d2b1711e233983362c518985;hpb=58eeba9b521b0a0094ac90a37fd88811c6a27376;p=Sone.git

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index d60ee23..5aaa6a5 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -33,7 +33,7 @@ function registerInputTextareaSwap(inputElement, defaultText, inputFieldName, op
 				inputField.val(defaultText);
 			}
 		}).hide().data("inputField", $(this)).val($(this).val());
-		$(this).after(textarea);
+		$(this).data("textarea", textarea).after(textarea);
 		(function(inputField, textarea) {
 			inputField.focus(function() {
 				$(this).hide().attr("disabled", "disabled");
@@ -66,11 +66,11 @@ function registerInputTextareaSwap(inputElement, defaultText, inputFieldName, op
  * @param element
  *            The element to add a “comment” link to
  */
-function addCommentLink(postId, element, insertAfterThisElement) {
+function addCommentLink(postId, author, element, insertAfterThisElement) {
 	if (($(element).find(".show-reply-form").length > 0) || (getPostElement(element).find(".create-reply").length == 0)) {
 		return;
 	}
-	commentElement = (function(postId) {
+	commentElement = (function(postId, author) {
 		separator = $("<span> · </span>").addClass("separator");
 		var commentElement = $("<div><span>Comment</span></div>").addClass("show-reply-form").click(function() {
 			replyElement = $("#sone .post#" + postId + " .create-reply");
@@ -85,10 +85,11 @@ function addCommentLink(postId, element, insertAfterThisElement) {
 					replyElement.removeClass("light");
 				});
 			})(replyElement);
-			replyElement.find("input.reply-input").focus();
+			textArea = replyElement.find("input.reply-input").focus().data("textarea");
+			textArea.val(textArea.val() + "@sone://" + author + " ");
 		});
 		return commentElement;
-	})(postId);
+	})(postId, author);
 	$(insertAfterThisElement).after(commentElement.clone(true));
 	$(insertAfterThisElement).after(separator);
 }
@@ -415,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) {
@@ -666,7 +678,7 @@ function ajaxifySone(soneElement) {
 
 	/* mark Sone as known when clicking it. */
 	$(soneElement).click(function() {
-		markSoneAsKnown(soneElement);
+		markSoneAsKnown(this);
 	});
 }
 
@@ -757,7 +769,7 @@ function ajaxifyPost(postElement) {
 	});
 
 	/* add “comment” link. */
-	addCommentLink(getPostId(postElement), postElement, $(postElement).find(".post-status-line .time"));
+	addCommentLink(getPostId(postElement), getPostAuthor(postElement), postElement, $(postElement).find(".post-status-line .time"));
 
 	/* process all replies. */
 	replyIds = [];
@@ -817,7 +829,7 @@ function ajaxifyReply(replyElement) {
 			});
 		});
 	})(replyElement);
-	addCommentLink(getPostId(replyElement), replyElement, $(replyElement).find(".reply-status-line .time"));
+	addCommentLink(getPostId(replyElement), getReplyAuthor(replyElement), replyElement, $(replyElement).find(".reply-status-line .time"));
 
 	/* convert “show source” link into javascript function. */
 	$(replyElement).find(".show-reply-source").each(function() {
@@ -1009,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);
@@ -1049,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
@@ -1439,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);