X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=8f0aef780674e7630b10620192a6fc610e2e1cea;hb=d5a9580afb910af2dfd39768c71b926fe838e7d1;hp=5922717edd5a302a708b9be3676ee98b1e5cdf9f;hpb=0fd7000d91d4bcb417af27b009b546c7b0f38cc0;p=Sone.git

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index 5922717..8f0aef7 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -491,6 +491,8 @@ function updateReplyLikes(replyId) {
 /**
  * Posts a reply and calls the given callback when the request finishes.
  *
+ * @param sender
+ *            The ID of the sender
  * @param postId
  *            The ID of the post the reply refers to
  * @param text
@@ -499,14 +501,14 @@ function updateReplyLikes(replyId) {
  *            The callback function to call when the request finishes (takes 3
  *            parameters: success, error, replyId)
  */
-function postReply(postId, text, callbackFunction) {
-	$.getJSON("createReply.ajax", { "formPassword" : getFormPassword(), "post" : postId, "text": text }, function(data, textStatus) {
+function postReply(sender, postId, text, callbackFunction) {
+	$.getJSON("createReply.ajax", { "formPassword" : getFormPassword(), "sender": sender, "post" : postId, "text": text }, function(data, textStatus) {
 		if (data == null) {
 			/* TODO - show error */
 			return;
 		}
 		if (data.success) {
-			callbackFunction(true, null, data.reply);
+			callbackFunction(true, null, data.reply, data.sone);
 		} else {
 			callbackFunction(false, data.error);
 		}
@@ -535,6 +537,56 @@ function getReply(replyId, callbackFunction) {
 }
 
 /**
+ * Ajaxifies the given Sone by enhancing all eligible elements with AJAX.
+ *
+ * @param soneElement
+ *            The Sone to ajaxify
+ */
+function ajaxifySone(soneElement) {
+	/*
+	 * convert all “follow”, “unfollow”, “lock”, and “unlock” links to something
+	 * nicer.
+	 */
+	$(".follow", soneElement).submit(function() {
+		var followElement = this;
+		$.getJSON("followSone.ajax", { "sone": getSoneId(this), "formPassword": getFormPassword() }, function() {
+			$(followElement).addClass("hidden");
+			$(followElement).parent().find(".unfollow").removeClass("hidden");
+		});
+		return false;
+	});
+	$(".unfollow", soneElement).submit(function() {
+		var unfollowElement = this;
+		$.getJSON("unfollowSone.ajax", { "sone": getSoneId(this), "formPassword": getFormPassword() }, function() {
+			$(unfollowElement).addClass("hidden");
+			$(unfollowElement).parent().find(".follow").removeClass("hidden");
+		});
+		return false;
+	});
+	$(".lock", soneElement).submit(function() {
+		var lockElement = this;
+		$.getJSON("lockSone.ajax", { "sone" : getSoneId(this), "formPassword" : getFormPassword() }, function() {
+			$(lockElement).addClass("hidden");
+			$(lockElement).parent().find(".unlock").removeClass("hidden");
+		});
+		return false;
+	});
+	$(".unlock", soneElement).submit(function() {
+		var unlockElement = this;
+		$.getJSON("unlockSone.ajax", { "sone" : getSoneId(this), "formPassword" : getFormPassword() }, function() {
+			$(unlockElement).addClass("hidden");
+			$(unlockElement).parent().find(".lock").removeClass("hidden");
+		});
+		return false;
+	});
+
+	/* mark Sone as known when clicking it. */
+	$(soneElement).click(function() {
+		markSoneAsKnown(getSoneId(this));
+	});
+}
+
+/**
  * Ajaxifies the given post by enhancing all eligible elements with AJAX.
  *
  * @param postElement
@@ -545,21 +597,25 @@ function ajaxifyPost(postElement) {
 		return false;
 	});
 	$(postElement).find(".create-reply button:submit").click(function() {
-		inputField = $(this.form).find(":input:enabled").get(0);
+		sender = $(this.form).find(":input[name=sender]").val();
+		inputField = $(this.form).find(":input[name=text]:enabled").get(0);
 		postId = getPostId(this);
 		text = $(inputField).val();
-		(function(postId, text, inputField) {
-			postReply(postId, text, function(success, error, replyId) {
+		(function(sender, postId, text, inputField) {
+			postReply(sender, postId, text, function(success, error, replyId, soneId) {
 				if (success) {
 					$(inputField).val("");
-					loadNewReply(replyId, getCurrentSoneId(), postId);
+					loadNewReply(replyId, soneId, postId);
 					markPostAsKnown(getPostElement(inputField));
 					$("#sone .post#" + postId + " .create-reply").addClass("hidden");
+					$("#sone .post#" + postId + " .create-reply .sender").hide();
+					$("#sone .post#" + postId + " .create-reply .select-sender").show();
+					$("#sone .post#" + postId + " .create-reply :input[name=sender]").val(getCurrentSoneId());
 				} else {
 					alert(error);
 				}
 			});
-		})(postId, text, inputField);
+		})(sender, postId, text, inputField);
 		return false;
 	});
 
@@ -612,6 +668,15 @@ function ajaxifyPost(postElement) {
 		});
 	});
 
+	/* process sender selection. */
+	$(".select-sender", postElement).css("display", "inline");
+	$(".sender", postElement).hide();
+	$(".select-sender button", postElement).click(function() {
+		$(".sender", postElement).show();
+		$(".select-sender", postElement).hide();
+		return false;
+	});
+
 	/* mark everything as known on click. */
 	$(postElement).click(function(event) {
 		if ($(event.target).hasClass("click-to-show")) {
@@ -711,6 +776,11 @@ function getStatus() {
 				oldNotification = $("#sone #notification-area .notification#" + value.id);
 				notification = ajaxifyNotification(createNotification(value.id, value.text, value.dismissable)).hide();
 				if (oldNotification.length != 0) {
+					if (oldNotification.find(".short-text").length > 0) {
+						opened = !oldNotification.find(".short-text").hasClass("hidden");
+						notification.find(".short-text").toggleClass("hidden", opened);
+						notification.find(".text").toggleClass("hidden", !opened);
+					}
 					oldNotification.replaceWith(notification.show());
 				} else {
 					$("#sone #notification-area").append(notification);
@@ -924,6 +994,20 @@ function loadNewReply(replyId, soneId, postId, postSoneId) {
 	});
 }
 
+/**
+ * Marks the given Sone as known if it is still new.
+ *
+ * @param soneElement
+ *            The Sone to mark as known
+ */
+function markSoneAsKnown(soneElement) {
+	if ($(".new", soneElement).length > 0) {
+		$.getJSON("maskAsKnown.ajax", {"formPassword": getFormPassword(), "type": "sone", "id": getSoneId(soneElement)}, function(data, textStatus) {
+			$(soneElement).removeClass("new");
+		});
+	}
+}
+
 function markPostAsKnown(postElements) {
 	$(postElements).each(function() {
 		postElement = this;
@@ -1086,17 +1170,28 @@ $(document).ready(function() {
 	/* this initializes the status update input field. */
 	getTranslation("WebInterface.DefaultText.StatusUpdate", function(defaultText) {
 		registerInputTextareaSwap("#sone #update-status .status-input", defaultText, "text", false, false);
+		$("#sone #update-status .select-sender").css("display", "inline");
+		$("#sone #update-status .sender").hide();
+		$("#sone #update-status .select-sender button").click(function() {
+			$("#sone #update-status .sender").show();
+			$("#sone #update-status .select-sender").hide();
+			return false;
+		});
 		$("#sone #update-status").submit(function() {
 			if ($(this).find(":input.default:enabled").length > 0) {
 				return false;
 			}
-			text = $(this).find(":input:enabled").val();
-			$.getJSON("createPost.ajax", { "formPassword": getFormPassword(), "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(), "sender": sender, "text": text }, function(data, textStatus) {
 				if ((data != null) && data.success) {
-					loadNewPost(data.postId, getCurrentSoneId());
+					loadNewPost(data.postId, data.sone, data.recipient);
 				}
 			});
-			$(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;
 		});
 	});
@@ -1156,41 +1251,8 @@ $(document).ready(function() {
 		});
 	}
 
-	/*
-	 * convert all “follow”, “unfollow”, “lock”, and “unlock” links to something
-	 * nicer.
-	 */
-	$("#sone .follow").submit(function() {
-		var followElement = this;
-		$.getJSON("followSone.ajax", { "sone": getSoneId(this), "formPassword": getFormPassword() }, function() {
-			$(followElement).addClass("hidden");
-			$(followElement).parent().find(".unfollow").removeClass("hidden");
-		});
-		return false;
-	});
-	$("#sone .unfollow").submit(function() {
-		var unfollowElement = this;
-		$.getJSON("unfollowSone.ajax", { "sone": getSoneId(this), "formPassword": getFormPassword() }, function() {
-			$(unfollowElement).addClass("hidden");
-			$(unfollowElement).parent().find(".follow").removeClass("hidden");
-		});
-		return false;
-	});
-	$("#sone .lock").submit(function() {
-		var lockElement = this;
-		$.getJSON("lockSone.ajax", { "sone" : getSoneId(this), "formPassword" : getFormPassword() }, function() {
-			$(lockElement).addClass("hidden");
-			$(lockElement).parent().find(".unlock").removeClass("hidden");
-		});
-		return false;
-	});
-	$("#sone .unlock").submit(function() {
-		var unlockElement = this;
-		$.getJSON("unlockSone.ajax", { "sone" : getSoneId(this), "formPassword" : getFormPassword() }, function() {
-			$(unlockElement).addClass("hidden");
-			$(unlockElement).parent().find(".lock").removeClass("hidden");
-		});
-		return false;
+	$("#sone .sone").each(function() {
+		ajaxifySone($(this));
 	});
 
 	/* process all existing notifications, ajaxify dismiss buttons. */