X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=3fcf90769a05e3f5ae9321c5ba00f8816b1aae37;hb=e5b1a360879963dca1cd468353776c340d23e0b6;hp=c9d51c4f3cf76f8219a7b335bac08edb8d794bfa;hpb=701569d76dbf1916125d5cf81fb2b65c6976d6d7;p=Sone.git

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index c9d51c4..3fcf907 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -83,7 +83,9 @@ function addCommentLink(postId, author, element, insertAfterThisElement) {
 				});
 			})(replyElement);
 			textArea = replyElement.find("input.reply-input").focus().data("textarea");
-			textArea.val(textArea.val() + "@sone://" + author + " ");
+			if (author != getCurrentSoneId()) {
+				textArea.val(textArea.val() + "@sone://" + author + " ");
+			}
 		});
 		return commentElement;
 	})(postId, author);
@@ -281,6 +283,18 @@ function getSoneElement(element) {
 }
 
 /**
+ * Returns the ID of the sone of the context menu that contains the given
+ * element.
+ *
+ * @param element
+ *            The element within a context menu to get the Sone ID for
+ * @return The Sone ID
+ */
+function getMenuSone(element) {
+	return $(element).closest(".sone-menu").find(".sone-id").text();
+}
+
+/**
  * Generates a list of Sones by concatening the names of the given sones with a
  * new line character (“\n”).
  *
@@ -800,6 +814,45 @@ function ajaxifyPost(postElement) {
 
 	/* hide reply input field. */
 	$(postElement).find(".create-reply").addClass("hidden");
+
+	/* show Sone menu when hovering over the avatar. */
+	$(postElement).find(".post-avatar").mouseover(function() {
+		$(".sone-post-menu", postElement).mouseleave(function() {
+			$(this).fadeOut();
+		}).fadeIn();
+		return false;
+	});
+	(function(postElement) {
+		var soneId = $(".sone-id", postElement).text();
+		$(".sone-post-menu .follow", postElement).click(function() {
+			var followElement = this;
+			ajaxGet("followSone.ajax", { "sone": soneId, "formPassword": getFormPassword() }, function() {
+				$(followElement).addClass("hidden");
+				$(followElement).parent().find(".unfollow").removeClass("hidden");
+				$("#sone .sone-menu").each(function() {
+					if (getMenuSone(this) == soneId) {
+						$(".follow", this).toggleClass("hidden", true);
+						$(".unfollow", this).toggleClass("hidden", false);
+					}
+				});
+			});
+			return false;
+		});
+		$(".sone-post-menu .unfollow", postElement).click(function() {
+			var unfollowElement = this;
+			ajaxGet("unfollowSone.ajax", { "sone": soneId, "formPassword": getFormPassword() }, function() {
+				$(unfollowElement).addClass("hidden");
+				$(unfollowElement).parent().find(".follow").removeClass("hidden");
+				$("#sone .sone-menu").each(function() {
+					if (getMenuSone(this) == soneId) {
+						$(".follow", this).toggleClass("hidden", false);
+						$(".unfollow", this).toggleClass("hidden", true);
+					}
+				});
+			});
+			return false;
+		});
+	})(postElement);
 }
 
 /**
@@ -848,6 +901,45 @@ function ajaxifyReply(replyElement) {
 		untrustSone(getReplyAuthor(this));
 		return false;
 	});
+
+	/* show Sone menu when hovering over the avatar. */
+	$(replyElement).find(".reply-avatar").mouseover(function() {
+		$(".sone-reply-menu", replyElement).mouseleave(function() {
+			$(this).fadeOut();
+		}).fadeIn();
+		return false;
+	});
+	(function(replyElement) {
+		var soneId = $(".sone-id", replyElement).text();
+		$(".sone-menu .follow", replyElement).click(function() {
+			var followElement = this;
+			ajaxGet("followSone.ajax", { "sone": soneId, "formPassword": getFormPassword() }, function() {
+				$(followElement).addClass("hidden");
+				$(followElement).parent().find(".unfollow").removeClass("hidden");
+				$("#sone .sone-menu").each(function() {
+					if (getMenuSone(this) == soneId) {
+						$(".follow", this).toggleClass("hidden", true);
+						$(".unfollow", this).toggleClass("hidden", false);
+					}
+				});
+			});
+			return false;
+		});
+		$(".sone-menu .unfollow", replyElement).click(function() {
+			var unfollowElement = this;
+			ajaxGet("unfollowSone.ajax", { "sone": soneId, "formPassword": getFormPassword() }, function() {
+				$(unfollowElement).addClass("hidden");
+				$(unfollowElement).parent().find(".follow").removeClass("hidden");
+				$("#sone .sone-menu").each(function() {
+					if (getMenuSone(this) == soneId) {
+						$(".follow", this).toggleClass("hidden", false);
+						$(".unfollow", this).toggleClass("hidden", true);
+					}
+				});
+			});
+			return false;
+		});
+	})(replyElement);
 }
 
 /**
@@ -866,7 +958,11 @@ function ajaxifyNotification(notification) {
 		notification.find(".text").addClass("hidden");
 	}
 	notification.find("form.mark-as-read button").click(function() {
-		ajaxGet("markAsKnown.ajax", {"formPassword": getFormPassword(), "type": $(":input[name=type]", this.form).val(), "id": $(":input[name=id]", this.form).val()});
+		allIds = $(":input[name=id]", this.form).val().split(" ");
+		for (index = 0; index < allIds.length; index += 16) {
+			ids = allIds.slice(index, index + 16).join(" ");
+			ajaxGet("markAsKnown.ajax", {"formPassword": getFormPassword(), "type": $(":input[name=type]", this.form).val(), "id": ids});
+		}
 	});
 	notification.find("a[class^='link-']").each(function() {
 		linkElement = $(this);
@@ -1077,8 +1173,10 @@ function loadNotifications(notificationIds) {
 				oldNotification.replaceWith(notification.show());
 			} else {
 				$("#sone #notification-area").append(notification);
-				notification.slideDown();
-				setActivity();
+				if (value.id.substring(0, 5) != "local") {
+					notification.slideDown();
+					setActivity();
+				}
 			}
 		});
 	});
@@ -1209,7 +1307,7 @@ function loadNewPost(postId, soneId, recipientId, time) {
 	}
 	if (!isIndexPage() || (getPage(".pagination-index") > 1)) {
 		if (!isViewPostPage() || (getShownPostId() != postId)) {
-			if (!isViewSonePage() || ((getShownSoneId() != soneId) && (getShownSoneId() != recipientId))) {
+			if (!isViewSonePage() || ((getShownSoneId() != soneId) && (getShownSoneId() != recipientId)) || (getPage(".post-navigation") > 1)) {
 				return;
 			}
 		}
@@ -1222,7 +1320,7 @@ function loadNewPost(postId, soneId, recipientId, time) {
 			if (hasPost(data.post.id)) {
 				return;
 			}
-			if ((!isIndexPage() || (getPage(".pagination-index") > 1)) && !(isViewSonePage() && ((getShownSoneId() == data.post.sone) || (getShownSoneId() == data.post.recipient)))) {
+			if ((!isIndexPage() || (getPage(".pagination-index") > 1)) && !(isViewSonePage() && ((getShownSoneId() == data.post.sone) || (getShownSoneId() == data.post.recipient) || (getPage(".post-navigation") > 1)))) {
 				return;
 			}
 			var firstOlderPost = null;
@@ -1233,6 +1331,9 @@ function loadNewPost(postId, soneId, recipientId, time) {
 				}
 			});
 			newPost = $(data.post.html).addClass("hidden");
+			if ($(".post-author-local", newPost).text() == "true") {
+				newPost.removeClass("new");
+			}
 			if (firstOlderPost != null) {
 				newPost.insertBefore(firstOlderPost);
 			}
@@ -1266,6 +1367,14 @@ function loadNewReply(replyId, soneId, postId, postSoneId) {
 					}
 				});
 				newReply = $(data.reply.html).addClass("hidden");
+				if ($(".reply-author-local", newReply).text() == "true") {
+					newReply.removeClass("new");
+					(function(newReply) {
+						setTimeout(function() {
+							markReplyAsKnown(newReply, false);
+						}, 5000);
+					})(newReply);
+				}
 				if (firstNewerReply != null) {
 					newReply.insertBefore(firstNewerReply);
 				} else {
@@ -1306,7 +1415,7 @@ function markSoneAsKnown(soneElement, skipRequest) {
 function markPostAsKnown(postElements, skipRequest) {
 	$(postElements).each(function() {
 		postElement = this;
-		if ($(postElement).hasClass("new")) {
+		if ($(postElement).hasClass("new") || ((typeof skipRequest != "undefined") && !skipRequest)) {
 			(function(postElement) {
 				$(postElement).removeClass("new");
 				if ((typeof skipRequest == "undefined") || !skipRequest) {
@@ -1322,7 +1431,7 @@ function markPostAsKnown(postElements, skipRequest) {
 function markReplyAsKnown(replyElements, skipRequest) {
 	$(replyElements).each(function() {
 		replyElement = this;
-		if ($(replyElement).hasClass("new")) {
+		if ($(replyElement).hasClass("new") || ((typeof skipRequest != "undefined") && !skipRequest)) {
 			(function(replyElement) {
 				$(replyElement).removeClass("new");
 				if ((typeof skipRequest == "undefined") || !skipRequest) {