X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=d60ee230157664d7d2b1711e233983362c518985;hb=e17523ae9c800ddf6a8e31bfa4a56f4aa0278aec;hp=d9d6f0688e821a5d1892d1b05b66638af429c695;hpb=bd423714c75ceff757c493a0fe863c5b481ee66d;p=Sone.git

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index d9d6f06..d60ee23 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -218,7 +218,8 @@ function enhanceDeletePostButton(button, postId, text) {
 			if (data.success) {
 				$("#sone .post#" + postId).slideUp();
 			} else if (data.error == "invalid-post-id") {
-				alert("Invalid post ID given!");
+				/* pretend the post is already gone. */
+				getPost(postId).slideUp();
 			} else if (data.error == "auth-required") {
 				alert("You need to be logged in.");
 			} else if (data.error == "not-authorized") {
@@ -249,7 +250,8 @@ function enhanceDeleteReplyButton(button, replyId, text) {
 			if (data.success) {
 				$("#sone .reply#" + replyId).slideUp();
 			} else if (data.error == "invalid-reply-id") {
-				alert("Invalid reply ID given!");
+				/* pretend the reply is already gone. */
+				getReply(replyId).slideUp();
 			} else if (data.error == "auth-required") {
 				alert("You need to be logged in.");
 			} else if (data.error == "not-authorized") {
@@ -879,6 +881,90 @@ function ajaxifyNotification(notification) {
 	return notification;
 }
 
+/**
+ * Retrieves element IDs from notification elements.
+ *
+ * @param notification
+ *            The notification element
+ * @param selector
+ *            The selector of the element containing the ID as text
+ * @returns All extracted IDs
+ */
+function getElementIds(notification, selector) {
+	elementIds = [];
+	$(selector, notification).each(function() {
+		elementIds.push($(this).text());
+	});
+	return elementIds;
+}
+
+/**
+ * Compares the given notification elements and calls {@link #markSoneAsKnown()}
+ * for every ID that is contained in the old notification but not in the new.
+ *
+ * @param oldNotification
+ *            The old notification element
+ * @param newNotification
+ *            The new notification element
+ */
+function checkForRemovedSones(oldNotification, newNotification) {
+	if (getNotificationId(oldNotification) != "new-sone-notification") {
+		return;
+	}
+	oldIds = getElementIds(oldNotification, ".sone-id");
+	newIds = getElementIds(newNotification, ".sone-id");
+	$.each(oldIds, function(index, value) {
+		if ($.inArray(value, newIds) == -1) {
+			markSoneAsKnown(getSone(value), true);
+		}
+	});
+}
+
+/**
+ * Compares the given notification elements and calls {@link #markPostAsKnown()}
+ * for every ID that is contained in the old notification but not in the new.
+ *
+ * @param oldNotification
+ *            The old notification element
+ * @param newNotification
+ *            The new notification element
+ */
+function checkForRemovedPosts(oldNotification, newNotification) {
+	if (getNotificationId(oldNotification) != "new-post-notification") {
+		return;
+	}
+	oldIds = getElementIds(oldNotification, ".post-id");
+	newIds = getElementIds(newNotification, ".post-id");
+	$.each(oldIds, function(index, value) {
+		if ($.inArray(value, newIds) == -1) {
+			markPostAsKnown(getPost(value), true);
+		}
+	});
+}
+
+/**
+ * Compares the given notification elements and calls
+ * {@link #markReplyAsKnown()} for every ID that is contained in the old
+ * notification but not in the new.
+ *
+ * @param oldNotification
+ *            The old notification element
+ * @param newNotification
+ *            The new notification element
+ */
+function checkForRemovedReplies(oldNotification, newNotification) {
+	if (getNotificationId(oldNotification) != "new-replies-notification") {
+		return;
+	}
+	oldIds = getElementIds(oldNotification, ".reply-id");
+	newIds = getElementIds(newNotification, ".reply-id");
+	$.each(oldIds, function(index, value) {
+		if ($.inArray(value, newIds) == -1) {
+			markReplyAsKnown(getReply(value), true);
+		}
+	});
+}
+
 function getStatus() {
 	$.getJSON("getStatus.ajax", {"loadAllSones": isKnownSonesPage()}, function(data, textStatus) {
 		if ((data != null) && data.success) {
@@ -897,8 +983,28 @@ function getStatus() {
 					}
 				});
 				if (!foundNotification) {
+					if (notificationId == "new-sone-notification") {
+						$(".sone-id", this).each(function(index, element) {
+							soneId = $(this).text();
+							markSoneAsKnown(getSone(soneId), true);
+						});
+					} else if (notificationId == "new-post-notification") {
+						$(".post-id", this).each(function(index, element) {
+							postId = $(this).text();
+							markPostAsKnown(getPost(postId), true);
+						});
+					} else if (notificationId == "new-replies-notification") {
+						$(".reply-id", this).each(function(index, element) {
+							replyId = $(this).text();
+							markReplyAsKnown(getReply(replyId), true);
+						});
+					}
 					$(this).slideUp("normal", function() {
 						$(this).remove();
+						/* remove activity when no notifications are visible. */
+						if ($("#sone #notification-area .notification").length == 0) {
+							resetActivity();
+						}
 					});
 				}
 			});
@@ -912,6 +1018,9 @@ function getStatus() {
 						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);
@@ -1226,9 +1335,6 @@ function updatePostTimes(postIds) {
  *            The tooltip to show
  */
 function updateReplyTime(replyId, timeText, refreshTime, tooltip) {
-	if (!getReply(replyId).is(":visible")) {
-		return;
-	}
 	getReply(replyId).find(".reply-status-line > .time").html(timeText).attr("title", tooltip);
 	(function(replyId, refreshTime) {
 		setTimeout(function() {
@@ -1258,6 +1364,7 @@ function resetActivity() {
 	if (title.indexOf('(') == 0) {
 		setTitle(title.substr(title.indexOf(' ') + 1));
 	}
+	iconBlinking = false;
 }
 
 function setActivity() {
@@ -1296,7 +1403,7 @@ var iconBlinking = false;
  * showing the activity state, it is returned to normal.
  */
 function toggleIcon() {
-	if (focus) {
+	if (focus || !iconBlinking) {
 		if (iconActive) {
 			changeIcon("images/icon.png");
 			iconActive = false;
@@ -1455,9 +1562,6 @@ $(document).ready(function() {
 			sender = $(this).find(":input[name=sender]").val();
 			text = $(this).find(":input[name=text]:enabled").val();
 			$.getJSON("createPost.ajax", { "formPassword": getFormPassword(), "sender": sender, "text": text }, function(data, textStatus) {
-				if ((data != null) && data.success) {
-					loadNewPost(data.postId, data.sone, data.recipient);
-				}
 				button.removeAttr("disabled");
 			});
 			$(this).find(":input[name=sender]").val(getCurrentSoneId());
@@ -1486,11 +1590,7 @@ $(document).ready(function() {
 		$("#sone #post-message").submit(function() {
 			sender = $(this).find(":input[name=sender]").val();
 			text = $(this).find(":input[name=text]:enabled").val();
-			$.getJSON("createPost.ajax", { "formPassword": getFormPassword(), "recipient": getShownSoneId(), "sender": sender, "text": text }, function(data, textStatus) {
-				if ((data != null) && data.success) {
-					loadNewPost(data.postId, getCurrentSoneId());
-				}
-			});
+			$.getJSON("createPost.ajax", { "formPassword": getFormPassword(), "recipient": getShownSoneId(), "sender": sender, "text": text });
 			$(this).find(":input[name=sender]").val(getCurrentSoneId());
 			$(this).find(":input[name=text]:enabled").val("").blur();
 			$(this).find(".sender").hide();