X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=a3761b85f4c266b3e57eed596b8fd066b314c0d9;hb=d615555392317949e47f6367209ee7194f650768;hp=fb16b979db0877cab0f1d0407e5b27cb9a42cff2;hpb=7d12ad2cccddffb7f38c266cb554fc52f2d6b1fe;p=Sone.git

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index fb16b97..a3761b8 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -37,7 +37,8 @@ function registerInputTextareaSwap(inputElement, defaultText, inputFieldName, op
 		(function(inputField, textarea) {
 			inputField.focus(function() {
 				$(this).hide().attr("disabled", "disabled");
-				textarea.show().focus();
+				/* no, show(), “display: block” is not what I need. */
+				textarea.attr("style", "display: inline").focus();
 			});
 			if (inputField.val() == "") {
 				inputField.addClass("default");
@@ -49,6 +50,7 @@ function registerInputTextareaSwap(inputElement, defaultText, inputFieldName, op
 			$(inputField.get(0).form).submit(function() {
 				inputField.attr("disabled", "disabled");
 				if (!optional && (textarea.val() == "")) {
+					inputField.removeAttr("disabled").focus();
 					return false;
 				}
 			});
@@ -297,6 +299,17 @@ function getSoneId(element) {
 	return getSoneElement(element).find(".id").text();
 }
 
+/**
+ * Returns the element of the post with the given ID.
+ *
+ * @param postId
+ *            The ID of the post
+ * @returns The element of the post
+ */
+function getPost(postId) {
+	return $("#sone .post#" + postId);
+}
+
 function getPostElement(element) {
 	return $(element).closest(".post");
 }
@@ -475,6 +488,38 @@ function updateTrustControls(soneId, trustValue) {
 	});
 }
 
+/**
+ * Bookmarks the post with the given ID.
+ *
+ * @param postId
+ *            The ID of the post to bookmark
+ */
+function bookmarkPost(postId) {
+	(function(postId) {
+		$.getJSON("bookmark.ajax", {"formPassword": getFormPassword(), "type": "post", "post": postId}, function(data, textStatus) {
+			if ((data != null) && data.success) {
+				getPost(postId).find(".bookmark").toggleClass("hidden", true);
+				getPost(postId).find(".unbookmark").toggleClass("hidden", false);
+			}
+		});
+	})(postId);
+}
+
+/**
+ * Unbookmarks the post with the given ID.
+ *
+ * @param postId
+ *            The ID of the post to unbookmark
+ */
+function unbookmarkPost(postId) {
+	$.getJSON("unbookmark.ajax", {"formPassword": getFormPassword(), "type": "post", "post": postId}, function(data, textStatus) {
+		if ((data != null) && data.success) {
+			getPost(postId).find(".bookmark").toggleClass("hidden", false);
+			getPost(postId).find(".unbookmark").toggleClass("hidden", true);
+		}
+	});
+}
+
 function updateReplyLikes(replyId) {
 	$.getJSON("getLikes.ajax", { "type": "reply", "reply": replyId }, function(data, textStatus) {
 		if ((data != null) && data.success) {
@@ -596,6 +641,8 @@ function ajaxifyPost(postElement) {
 		return false;
 	});
 	$(postElement).find(".create-reply button:submit").click(function() {
+		button = $(this);
+		button.attr("disabled", "disabled");
 		sender = $(this.form).find(":input[name=sender]").val();
 		inputField = $(this.form).find(":input[name=text]:enabled").get(0);
 		postId = getPostId(this);
@@ -612,6 +659,7 @@ function ajaxifyPost(postElement) {
 				} else {
 					alert(error);
 				}
+				button.removeAttr("disabled");
 			});
 		})(sender, postId, text, inputField);
 		return false;
@@ -649,6 +697,25 @@ function ajaxifyPost(postElement) {
 		return false;
 	});
 
+	/* convert bookmark/unbookmark buttons to javascript functions. */
+	$(postElement).find(".bookmark").submit(function() {
+		bookmarkPost(getPostId(this));
+		return false;
+	});
+	$(postElement).find(".unbookmark").submit(function() {
+		unbookmarkPost(getPostId(this));
+		return false;
+	});
+
+	/* convert “show source” link into javascript function. */
+	$(postElement).find(".show-source").each(function() {
+		$("a", this).click(function() {
+			$(".post-text.text", getPostElement(this)).toggleClass("hidden");
+			$(".post-text.raw-text", getPostElement(this)).toggleClass("hidden");
+			return false;
+		});
+	});
+
 	/* add “comment” link. */
 	addCommentLink(getPostId(postElement), postElement, $(postElement).find(".post-status-line .time"));
 
@@ -709,6 +776,15 @@ function ajaxifyReply(replyElement) {
 	})(replyElement);
 	addCommentLink(getPostId(replyElement), replyElement, $(replyElement).find(".reply-status-line .time"));
 
+	/* convert “show source” link into javascript function. */
+	$(replyElement).find(".show-reply-source").each(function() {
+		$("a", this).click(function() {
+			$(".reply-text.text", getReplyElement(this)).toggleClass("hidden");
+			$(".reply-text.raw-text", getReplyElement(this)).toggleClass("hidden");
+			return false;
+		});
+	});
+
 	/* convert trust control buttons to javascript functions. */
 	$(replyElement).find(".reply-trust").submit(function() {
 		trustSone(getReplyAuthor(this));
@@ -769,6 +845,22 @@ function getStatus() {
 			$.each(data.sones, function(index, value) {
 				updateSoneStatus(value.id, value.name, value.status, value.modified, value.locked, value.lastUpdatedUnknown ? null : value.lastUpdated);
 			});
+			/* search for removed notifications. */
+			$("#sone #notification-area .notification").each(function() {
+				notificationId = $(this).attr("id");
+				foundNotification = false;
+				$.each(data.notifications, function(index, value) {
+					if (value.id == notificationId) {
+						foundNotification = true;
+						return false;
+					}
+				});
+				if (!foundNotification) {
+					$(this).slideUp("normal", function() {
+						$(this).remove();
+					});
+				}
+			});
 			/* process notifications. */
 			$.each(data.notifications, function(index, value) {
 				oldNotification = $("#sone #notification-area .notification#" + value.id);
@@ -783,11 +875,8 @@ function getStatus() {
 				} else {
 					$("#sone #notification-area").append(notification);
 					notification.slideDown();
+					setActivity();
 				}
-				setActivity();
-			});
-			$.each(data.removedNotifications, function(index, value) {
-				$("#sone #notification-area .notification#" + value.id).slideUp();
 			});
 			/* process new posts. */
 			$.each(data.newPosts, function(index, value) {
@@ -1083,7 +1172,6 @@ function toggleIcon() {
 		iconBlinking = false;
 	} else {
 		iconActive = !iconActive;
-		console.log("showing icon: " + iconActive);
 		changeIcon(iconActive ? "images/icon-activity.png" : "images/icon.png");
 		setTimeout(toggleIcon, 1500);
 	}
@@ -1227,6 +1315,8 @@ $(document).ready(function() {
 			return false;
 		});
 		$("#sone #update-status").submit(function() {
+			button = $("button:submit", this);
+			button.attr("disabled", "disabled");
 			if ($(this).find(":input.default:enabled").length > 0) {
 				return false;
 			}
@@ -1236,6 +1326,7 @@ $(document).ready(function() {
 				if ((data != null) && data.success) {
 					loadNewPost(data.postId, data.sone, data.recipient);
 				}
+				button.removeAttr("disabled");
 			});
 			$(this).find(":input[name=sender]").val(getCurrentSoneId());
 			$(this).find(":input[name=text]:enabled").val("").blur();
@@ -1245,17 +1336,33 @@ $(document).ready(function() {
 		});
 	});
 
+	/* ajaxify the search input field. */
+	getTranslation("WebInterface.DefaultText.Search", function(defaultText) {
+		registerInputTextareaSwap("#sone #search input[name=query]", defaultText, "query", false, true);
+	});
+
 	/* ajaxify input field on “view Sone” page. */
 	getTranslation("WebInterface.DefaultText.Message", function(defaultText) {
 		registerInputTextareaSwap("#sone #post-message input[name=text]", defaultText, "text", false, false);
+		$("#sone #post-message .select-sender").css("display", "inline");
+		$("#sone #post-message .sender").hide();
+		$("#sone #post-message .select-sender button").click(function() {
+			$("#sone #post-message .sender").show();
+			$("#sone #post-message .select-sender").hide();
+			return false;
+		});
 		$("#sone #post-message").submit(function() {
-			text = $(this).find(":input:enabled").val();
-			$.getJSON("createPost.ajax", { "formPassword": getFormPassword(), "recipient": getShownSoneId(), "text": text }, function(data, textStatus) {
+			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());
 				}
 			});
-			$(this).find(":input:enabled").val("").blur();
+			$(this).find(":input[name=sender]").val(getCurrentSoneId());
+			$(this).find(":input[name=text]:enabled").val("").blur();
+			$(this).find(".sender").hide();
+			$(this).find(".select-sender").show();
 			return false;
 		});
 	});