X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=2d6c8ecbda64eb1bc08bb9be594b16454a01862d;hb=76e7a20f5212d9c202dbe92e958834ce3f99bd0e;hp=fe2e12de50982ceed772567c4c592767dfad4510;hpb=7c74e4e76059ce62f7d4ed77c78420d720ed6b42;p=Sone.git

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index fe2e12d..2d6c8ec 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -453,7 +453,7 @@ function ajaxifyPost(postElement) {
 			postReply(postId, text, function(success, error, replyId) {
 				if (success) {
 					$(inputField).val("");
-					loadNewReply(replyId);
+					loadNewReply(replyId, getCurrentSoneId(), postId);
 					markPostAsKnown(getPostElement(inputField));
 					$("#sone .post#" + postId + " .create-reply").addClass("hidden");
 				} else {
@@ -500,7 +500,10 @@ function ajaxifyPost(postElement) {
 	});
 
 	/* mark everything as known on click. */
-	$(postElement).click(function() {
+	$(postElement).click(function(event) {
+		if ($(event.target).hasClass("click-to-show")) {
+			return false;
+		}
 		markPostAsKnown(this);
 	});
 
@@ -585,11 +588,11 @@ function getStatus() {
 			});
 			/* process new posts. */
 			$.each(data.newPosts, function(index, value) {
-				loadNewPost(value);
+				loadNewPost(value.id, value.sone, value.recipient, value.time);
 			});
 			/* process new replies. */
 			$.each(data.newReplies, function(index, value) {
-				loadNewReply(value);
+				loadNewReply(value.id, value.sone, value.post, value.postSone);
 			});
 			/* do it again in 5 seconds. */
 			setTimeout(getStatus, 5000);
@@ -604,6 +607,16 @@ function getStatus() {
 }
 
 /**
+ * Returns the ID of the currently logged in Sone.
+ *
+ * @return The ID of the current Sone, or an empty string if no Sone is logged
+ *         in
+ */
+function getCurrentSoneId() {
+	return $("#currentSoneId").text();
+}
+
+/**
  * Returns the content of the page-id attribute.
  *
  * @returns The page ID
@@ -696,10 +709,20 @@ function hasReply(replyId) {
 	return $("#sone .reply#" + replyId).length > 0;
 }
 
-function loadNewPost(postId) {
+function loadNewPost(postId, soneId, recipientId, time) {
 	if (hasPost(postId)) {
 		return;
 	}
+	if (!isIndexPage()) {
+		if (!isViewPostPage() || (getShownPostId() != postId)) {
+			if (!isViewSonePage() || ((getShownSoneId() != soneId) && (getShownSoneId() != recipientId))) {
+				return;
+			}
+		}
+	}
+	if (getPostTime($("#sone .post").last()) > time) {
+		return;
+	}
 	$.getJSON("getPost.ajax", { "post" : postId }, function(data, textStatus) {
 		if ((data != null) && data.success) {
 			if (hasPost(data.post.id)) {
@@ -718,8 +741,6 @@ function loadNewPost(postId) {
 			newPost = $(data.post.html).addClass("hidden");
 			if (firstOlderPost != null) {
 				newPost.insertBefore(firstOlderPost);
-			} else {
-				$("#sone #posts").append(newPost);
 			}
 			ajaxifyPost(newPost);
 			newPost.slideDown();
@@ -728,10 +749,13 @@ function loadNewPost(postId) {
 	});
 }
 
-function loadNewReply(replyId) {
+function loadNewReply(replyId, soneId, postId, postSoneId) {
 	if (hasReply(replyId)) {
 		return;
 	}
+	if (!hasPost(postId)) {
+		return;
+	}
 	$.getJSON("getReply.ajax", { "reply": replyId }, function(data, textStatus) {
 		/* find post. */
 		if ((data != null) && data.success) {
@@ -772,6 +796,7 @@ function markPostAsKnown(postElements) {
 			(function(postElement) {
 				$.getJSON("markPostAsKnown.ajax", {"formPassword": getFormPassword(), "post": getPostId(postElement)}, function(data, textStatus) {
 					$(postElement).removeClass("new");
+					$(".click-to-show", postElement).removeClass("new");
 				});
 			})(postElement);
 		}
@@ -830,6 +855,91 @@ function createNotification(id, text, dismissable) {
 	return notification;
 }
 
+/**
+ * Shows the details of the notification with the given ID.
+ *
+ * @param notificationId
+ *            The ID of the notification
+ */
+function showNotificationDetails(notificationId) {
+	$("#sone .notification#" + notificationId + " .text").show();
+	$("#sone .notification#" + notificationId + " .short-text").hide();
+}
+
+/**
+ * Deletes the field with the given ID from the profile.
+ *
+ * @param fieldId
+ *            The ID of the field to delete
+ */
+function deleteProfileField(fieldId) {
+	$.getJSON("deleteProfileField.ajax", {"formPassword": getFormPassword(), "field": fieldId}, function(data, textStatus) {
+		if (data && data.success) {
+			$("#sone .profile-field#" + data.field.id).slideUp();
+		}
+	});
+}
+
+/**
+ * Renames a profile field.
+ *
+ * @param fieldId
+ *            The ID of the field to rename
+ * @param newName
+ *            The new name of the field
+ * @param successFunction
+ *            Called when the renaming was successful
+ */
+function editProfileField(fieldId, newName, successFunction) {
+	$.getJSON("editProfileField.ajax", {"formPassword": getFormPassword(), "field": fieldId, "name": newName}, function(data, textStatus) {
+		if (data && data.success) {
+			successFunction();
+		}
+	});
+}
+
+/**
+ * Moves the profile field with the given ID one slot in the given direction.
+ *
+ * @param fieldId
+ *            The ID of the field to move
+ * @param direction
+ *            The direction to move in (“up” or “down”)
+ * @param successFunction
+ *            Function to call on success
+ */
+function moveProfileField(fieldId, direction, successFunction) {
+	$.getJSON("moveProfileField.ajax", {"formPassword": getFormPassword(), "field": fieldId, "direction": direction}, function(data, textStatus) {
+		if (data && data.success) {
+			successFunction();
+		}
+	});
+}
+
+/**
+ * Moves the profile field with the given ID up one slot.
+ *
+ * @param fieldId
+ *            The ID of the field to move
+ * @param successFunction
+ *            Function to call on success
+ */
+function moveProfileFieldUp(fieldId, successFunction) {
+	moveProfileField(fieldId, "up", successFunction);
+}
+
+/**
+ * Moves the profile field with the given ID down one slot.
+ *
+ * @param fieldId
+ *            The ID of the field to move
+ * @param successFunction
+ *            Function to call on success
+ */
+function moveProfileFieldDown(fieldId, successFunction) {
+	moveProfileField(fieldId, "down", successFunction);
+}
+
 //
 // EVERYTHING BELOW HERE IS EXECUTED AFTER LOADING THE PAGE
 //
@@ -848,7 +958,7 @@ $(document).ready(function() {
 			text = $(this).find(":input:enabled").val();
 			$.getJSON("createPost.ajax", { "formPassword": getFormPassword(), "text": text }, function(data, textStatus) {
 				if ((data != null) && data.success) {
-					loadNewPost(data.postId);
+					loadNewPost(data.postId, getCurrentSoneId());
 				}
 			});
 			$(this).find(":input:enabled").val("").blur();
@@ -863,7 +973,7 @@ $(document).ready(function() {
 			text = $(this).find(":input:enabled").val();
 			$.getJSON("createPost.ajax", { "formPassword": getFormPassword(), "recipient": getShownSoneId(), "text": text }, function(data, textStatus) {
 				if ((data != null) && data.success) {
-					loadNewPost(data.postId);
+					loadNewPost(data.postId, getCurrentSoneId());
 				}
 			});
 			$(this).find(":input:enabled").val("").blur();
@@ -954,9 +1064,7 @@ $(document).ready(function() {
 	});
 
 	/* activate status polling. */
-	if (getPageId() != "login") {
-		setTimeout(getStatus, 5000);
-	}
+	setTimeout(getStatus, 5000);
 
 	/* reset activity counter when the page has focus. */
 	$(window).focus(function() {