X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=1341cc02d7e39ab32a9c75ad89ad53ecdb1024f4;hb=d0ab70772ef0709c58cc493c0c7864cd35a906ea;hp=67231968c57c66926011febca67b4f23c74d7fe8;hpb=68970fb016d46173a4e502ecac3cf693c495fa28;p=Sone.git

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index 6723196..1341cc0 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -981,6 +981,22 @@ 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();
 					});
@@ -996,6 +1012,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);
@@ -1011,6 +1030,10 @@ function getStatus() {
 			$.each(data.newReplies, function(index, value) {
 				loadNewReply(value.id, value.sone, value.post, value.postSone);
 			});
+			/* remove activity when no notifications are visible. */
+			if ($("#sone #notification-area .notification").length == 0) {
+				resetActivity();
+			}
 			/* do it again in 5 seconds. */
 			setTimeout(getStatus, 5000);
 		} else {
@@ -1539,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());
@@ -1570,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();