X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=86475e54368b4162f96a22edd97c92e3ebe1f50d;hb=e42a8f16b2ed6c3650cb288abbf48932ef63d97b;hp=8ef92cfe2f2c70fa9bd794ad64283c3fe4cac78d;hpb=ce6afea7bca91eb76f3d274c94d947e4579c49d6;p=Sone.git

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index 8ef92cf..86475e5 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;
 				}
 			});
@@ -331,6 +333,17 @@ function getPostAuthor(element) {
 	return getPostElement(element).find(".post-author").text();
 }
 
+/**
+ * Returns the element of the reply with the given ID.
+ *
+ * @param replyId
+ *            The ID of the reply
+ * @returns The element of the reply
+ */
+function getReply(replyId) {
+	return $("#sone .reply#" + replyId);
+}
+
 function getReplyElement(element) {
 	return $(element).closest(".reply");
 }
@@ -560,25 +573,6 @@ function postReply(sender, postId, text, callbackFunction) {
 }
 
 /**
- * Requests information about the reply with the given ID.
- *
- * @param replyId
- *            The ID of the reply
- * @param callbackFunction
- *            A callback function (parameters soneId, soneName, replyTime,
- *            replyDisplayTime, text, html)
- */
-function getReply(replyId, callbackFunction) {
-	$.getJSON("getReply.ajax", { "reply" : replyId }, function(data, textStatus) {
-		if ((data != null) && data.success) {
-			callbackFunction(data.soneId, data.soneName, data.time, data.displayTime, data.text, data.html);
-		}
-	}, function(xmlHttpRequest, textStatus, error) {
-		/* ignore error. */
-	});
-}
-
-/**
  * Ajaxifies the given Sone by enhancing all eligible elements with AJAX.
  *
  * @param soneElement
@@ -718,9 +712,12 @@ function ajaxifyPost(postElement) {
 	addCommentLink(getPostId(postElement), postElement, $(postElement).find(".post-status-line .time"));
 
 	/* process all replies. */
+	replyIds = [];
 	$(postElement).find(".reply").each(function() {
+		replyIds.push(getReplyId(this));
 		ajaxifyReply(this);
 	});
+	updateReplyTimes(replyIds.join(","));
 
 	/* process reply input fields. */
 	getTranslation("WebInterface.DefaultText.Reply", function(text) {
@@ -843,6 +840,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);
@@ -857,11 +870,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) {
@@ -1020,6 +1030,7 @@ function loadNewPost(postId, soneId, recipientId, time) {
 				newPost.insertBefore(firstOlderPost);
 			}
 			ajaxifyPost(newPost);
+			updatePostTimes(data.post.id);
 			newPost.slideDown();
 			setActivity();
 		}
@@ -1058,6 +1069,7 @@ function loadNewReply(replyId, soneId, postId, postSoneId) {
 					}
 				}
 				ajaxifyReply(newReply);
+				updateReplyTimes(data.reply.id);
 				newReply.slideDown();
 				setActivity();
 				return false;
@@ -1106,6 +1118,86 @@ function markReplyAsKnown(replyElements) {
 	});
 }
 
+/**
+ * Updates the time of the post with the given ID.
+ *
+ * @param postId
+ *            The ID of the post to update
+ * @param timeText
+ *            The text of the time to show
+ * @param refreshTime
+ *            The refresh time after which to request a new time (in seconds)
+ * @param tooltip
+ *            The tooltip to show
+ */
+function updatePostTime(postId, timeText, refreshTime, tooltip) {
+	if (!getPost(postId).is(":visible")) {
+		return;
+	}
+	getPost(postId).find(".post-status-line > .time a").html(timeText).attr("title", tooltip);
+	(function(postId, refreshTime) {
+		setTimeout(function() {
+			updatePostTimes(postId);
+		}, refreshTime * 1000);
+	})(postId, refreshTime);
+}
+
+/**
+ * Requests new rendered times for the posts with the given IDs.
+ *
+ * @param postIds
+ *            Comma-separated post IDs
+ */
+function updatePostTimes(postIds) {
+	$.getJSON("getTimes.ajax", { "posts" : postIds }, function(data, textStatus) {
+		if ((data != null) && data.success) {
+			$.each(data.postTimes, function(index, value) {
+				updatePostTime(index, value.timeText, value.refreshTime, value.tooltip);
+			});
+		}
+	});
+}
+
+/**
+ * Updates the time of the reply with the given ID.
+ *
+ * @param postId
+ *            The ID of the reply to update
+ * @param timeText
+ *            The text of the time to show
+ * @param refreshTime
+ *            The refresh time after which to request a new time (in seconds)
+ * @param tooltip
+ *            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() {
+			updateReplyTimes(replyId);
+		}, refreshTime * 1000);
+	})(replyId, refreshTime);
+}
+
+/**
+ * Requests new rendered times for the posts with the given IDs.
+ *
+ * @param postIds
+ *            Comma-separated post IDs
+ */
+function updateReplyTimes(replyIds) {
+	$.getJSON("getTimes.ajax", { "replies" : replyIds }, function(data, textStatus) {
+		if ((data != null) && data.success) {
+			$.each(data.replyTimes, function(index, value) {
+				updateReplyTime(index, value.timeText, value.refreshTime, value.tooltip);
+			});
+		}
+	});
+}
+
 function resetActivity() {
 	title = document.title;
 	if (title.indexOf('(') == 0) {
@@ -1364,6 +1456,13 @@ $(document).ready(function() {
 		});
 	});
 
+	/* update post times. */
+	postIds = [];
+	$("#sone .post").each(function() {
+		postIds.push(getPostId(this));
+	});
+	updatePostTimes(postIds.join(","));
+
 	/* hides all replies but the latest two. */
 	if (!isViewPostPage()) {
 		getTranslation("WebInterface.ClickToShow.Replies", function(text) {