X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=01c04a1cbb60d82c7cf171a8114db44129bb12be;hb=fd5860dbb46063f229492354af88f1ad3701772c;hp=1d45493ec914777ef91f58201aeabe01b1c100ea;hpb=1e6962e0e811a7fa3983855e45180ec209193a93;p=Sone.git

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index 1d45493..01c04a1 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -11,11 +11,7 @@ function registerInputTextareaSwap(inputSelector, defaultText, inputFieldName, o
 				$(this).hide();
 				inputField = $(this).data("inputField");
 				inputField.show().removeAttr("disabled").addClass("default");
-				(function(inputField) {
-					getTranslation(defaultText, function(translation) {
-						inputField.val(translation);
-					});
-				})(inputField);
+				inputField.val(defaultText);
 			}
 		}).hide().data("inputField", $(this)).val($(this).val());
 		$(this).after(textarea);
@@ -26,11 +22,7 @@ function registerInputTextareaSwap(inputSelector, defaultText, inputFieldName, o
 			});
 			if (inputField.val() == "") {
 				inputField.addClass("default");
-				(function(inputField) {
-					getTranslation(defaultText, function(translation) {
-						inputField.val(translation);
-					});
-				})(inputField);
+				inputField.val(defaultText);
 			} else {
 				inputField.hide().attr("disabled", "disabled");
 				textarea.show();
@@ -51,28 +43,40 @@ function addCommentLinks() {
 	}
 	$("#sone .post").each(function() {
 		postId = $(this).attr("id");
-		commentElement = (function(postId) {
-			var commentElement = $("<div><span>Comment</span></div>").addClass("show-reply-form").click(function() {
-				replyElement = $("#sone .post#" + postId + " .create-reply");
-				replyElement.removeClass("hidden");
-				replyElement.removeClass("light");
-				(function(replyElement) {
-					replyElement.find("input.reply-input").blur(function() {
-						if ($(this).hasClass("default")) {
-							replyElement.addClass("light");
-						}
-					}).focus(function() {
-						replyElement.removeClass("light");
-					});
-				})(replyElement);
-				replyElement.find("input.reply-input").focus();
-			});
-			return commentElement;
-		})(postId);
-		$(this).find(".create-reply").addClass("hidden");
-		$(this).find(".status-line .time").each(function() {
-			$(this).after(commentElement.clone(true));
+		addCommentLink(postId, $(this));
+	});
+}
+
+/**
+ * Adds a “comment” link to all status lines contained in the given element.
+ *
+ * @param postId
+ *            The ID of the post
+ * @param element
+ *            The element to add a “comment” link to
+ */
+function addCommentLink(postId, element) {
+	commentElement = (function(postId) {
+		var commentElement = $("<div><span>Comment</span></div>").addClass("show-reply-form").click(function() {
+			replyElement = $("#sone .post#" + postId + " .create-reply");
+			replyElement.removeClass("hidden");
+			replyElement.removeClass("light");
+			(function(replyElement) {
+				replyElement.find("input.reply-input").blur(function() {
+					if ($(this).hasClass("default")) {
+						replyElement.addClass("light");
+					}
+				}).focus(function() {
+					replyElement.removeClass("light");
+				});
+			})(replyElement);
+			replyElement.find("input.reply-input").focus();
 		});
+		return commentElement;
+	})(postId);
+	element.find(".create-reply").addClass("hidden");
+	element.find(".status-line .time").each(function() {
+		$(this).after(commentElement.clone(true));
 	});
 }
 
@@ -96,22 +100,36 @@ function getTranslation(key, callback) {
  *
  * @param soneId
  *            The ID of the Sone
+ * @param local
+ *            <code>true</code> if the Sone is local, <code>false</code>
+ *            otherwise
  */
-function getSoneStatus(soneId) {
+function getSoneStatus(soneId, local) {
 	$.getJSON("ajax/getSoneStatus.ajax", {"sone": soneId}, function(data, textStatus) {
 		updateSoneStatus(soneId, data.name, data.status, data.modified, data.lastUpdated);
 		/* seconds! */
 		updateInterval = 60;
-		if (data.modified || (data.status == "downloading") || (data.status == "inserting")) {
+		if (local || data.modified || (data.status == "downloading") || (data.status == "inserting")) {
 			updateInterval = 5;
 		}
 		setTimeout(function() {
-			getSoneStatus(soneId);
+			getSoneStatus(soneId, local);
 		}, updateInterval * 1000);
 	});
 }
 
 /**
+ * Filters the given Sone ID, replacing all “~” characters by an underscore.
+ *
+ * @param soneId
+ *            The Sone ID to filter
+ * @returns The filtered Sone ID
+ */
+function filterSoneId(soneId) {
+	return soneId.replace(/[^a-zA-Z0-9-]/g, "_");
+}
+
+/**
  * Updates the status of the given Sone.
  *
  * @param soneId
@@ -125,14 +143,14 @@ function getSoneStatus(soneId) {
  *            The date and time of the last update (formatted for display)
  */
 function updateSoneStatus(soneId, name, status, modified, lastUpdated) {
-	$("#sone .sone." + soneId).
+	$("#sone .sone." + filterSoneId(soneId)).
 		toggleClass("unknown", status == "unknown").
 		toggleClass("idle", status == "idle").
 		toggleClass("inserting", status == "inserting").
 		toggleClass("downloading", status == "downloading").
 		toggleClass("modified", modified);
-	$("#sone .sone." + soneId + " .last-update span.time").text(lastUpdated);
-	$("#sone .sone." + soneId + " .profile-link a").text(name);
+	$("#sone .sone." + filterSoneId(soneId) + " .last-update span.time").text(lastUpdated);
+	$("#sone .sone." + filterSoneId(soneId) + " .profile-link a").text(name);
 }
 
 var watchedSones = {};
@@ -142,15 +160,18 @@ var watchedSones = {};
  *
  * @param soneId
  *            The ID of the Sone to watch
+ * @param local
+ *            <code>true</code> if the Sone is local, <code>false</code>
+ *            otherwise
  */
-function watchSone(soneId) {
+function watchSone(soneId, local) {
 	if (watchedSones[soneId]) {
 		return;
 	}
 	watchedSones[soneId] = true;
 	(function(soneId) {
 		setTimeout(function() {
-			getSoneStatus(soneId);
+			getSoneStatus(soneId, local);
 		}, 5000);
 	})(soneId);
 }
@@ -160,36 +181,34 @@ function watchSone(soneId) {
  *
  * @param buttonId
  *            The selector of the button
- * @param translationKey
- *            The translation key of the text to show on the button
+ * @param text
+ *            The text to show on the button
  * @param deleteCallback
  *            The callback that actually deletes something
  */
-function enhanceDeleteButton(buttonId, translationKey, deleteCallback) {
+function enhanceDeleteButton(buttonId, text, deleteCallback) {
 	button = $(buttonId);
 	(function(button) {
-		getTranslation(translationKey, function(translation) {
-			newButton = $("<button></button>").addClass("confirm").hide().text(translation).click(function() {
-				$(this).fadeOut("slow");
-				deleteCallback();
-				return false;
-			}).insertAfter(button);
-			(function(button, newButton) {
-				button.click(function() {
-					button.fadeOut("slow", function() {
-						newButton.fadeIn("slow");
-						$(document).one("click", function() {
-							if (this != newButton.get(0)) {
-								newButton.fadeOut(function() {
-									button.fadeIn();
-								});
-							}
-						});
+		newButton = $("<button></button>").addClass("confirm").hide().text(text).click(function() {
+			$(this).fadeOut("slow");
+			deleteCallback();
+			return false;
+		}).insertAfter(button);
+		(function(button, newButton) {
+			button.click(function() {
+				button.fadeOut("slow", function() {
+					newButton.fadeIn("slow");
+					$(document).one("click", function() {
+						if (this != newButton.get(0)) {
+							newButton.fadeOut(function() {
+								button.fadeIn();
+							});
+						}
 					});
-					return false;
 				});
-			})(button, newButton);
-		});
+				return false;
+			});
+		})(button, newButton);
 	})(button);
 }
 
@@ -200,9 +219,11 @@ function enhanceDeleteButton(buttonId, translationKey, deleteCallback) {
  *            The selector of the button
  * @param postId
  *            The ID of the post to delete
+ * @param text
+ *            The text to replace the button with
  */
-function enhanceDeletePostButton(buttonId, postId) {
-	enhanceDeleteButton(buttonId, "WebInterface.Confirmation.DeletePostButton", function() {
+function enhanceDeletePostButton(buttonId, postId, text) {
+	enhanceDeleteButton(buttonId, text, function() {
 		$.getJSON("ajax/deletePost.ajax", { "post": postId, "formPassword": $("#sone #formPassword").text() }, function(data, textStatus) {
 			if (data.success) {
 				$("#sone .post#" + postId).slideUp();
@@ -224,9 +245,11 @@ function enhanceDeletePostButton(buttonId, postId) {
  *            The selector of the button
  * @param replyId
  *            The ID of the reply to delete
+ * @param text
+ *            The text to replace the button with
  */
-function enhanceDeleteReplyButton(buttonId, replyId) {
-	enhanceDeleteButton(buttonId, "WebInterface.Confirmation.DeleteReplyButton", function() {
+function enhanceDeleteReplyButton(buttonId, replyId, text) {
+	enhanceDeleteButton(buttonId, text, function() {
 		$.getJSON("ajax/deleteReply.ajax", { "reply": replyId, "formPassword": $("#sone #formPassword").text() }, function(data, textStatus) {
 			if (data.success) {
 				$("#sone .reply#" + replyId).slideUp();
@@ -250,6 +273,25 @@ function getSoneElement(element) {
 }
 
 /**
+ * Generates a list of Sones by concatening the names of the given sones with a
+ * new line character (“\n”).
+ *
+ * @param sones
+ *            The sones to format
+ * @returns {String} The created string
+ */
+function generateSoneList(sones) {
+	var soneList = "";
+	$.each(sones, function() {
+		if (soneList != "") {
+			soneList += "\n";
+		}
+		soneList += this.name;
+	});
+	return soneList;
+}
+
+/**
  * Returns the ID of the Sone that this element belongs to.
  *
  * @param element
@@ -278,16 +320,16 @@ function getReplyId(element) {
 
 function likePost(postId) {
 	$.getJSON("ajax/like.ajax", { "type": "post", "post" : postId, "formPassword": getFormPassword() }, function() {
-		$("#sone .post#" + postId + " > .status-line .like").addClass("hidden");
-		$("#sone .post#" + postId + " > .status-line .unlike").removeClass("hidden");
+		$("#sone .post#" + postId + " > .inner-part > .status-line .like").addClass("hidden");
+		$("#sone .post#" + postId + " > .inner-part > .status-line .unlike").removeClass("hidden");
 		updatePostLikes(postId);
 	});
 }
 
 function unlikePost(postId) {
 	$.getJSON("ajax/unlike.ajax", { "type": "post", "post" : postId, "formPassword": getFormPassword() }, function() {
-		$("#sone .post#" + postId + " > .status-line .unlike").addClass("hidden");
-		$("#sone .post#" + postId + " > .status-line .like").removeClass("hidden");
+		$("#sone .post#" + postId + " > .inner-part > .status-line .unlike").addClass("hidden");
+		$("#sone .post#" + postId + " > .inner-part > .status-line .like").removeClass("hidden");
 		updatePostLikes(postId);
 	});
 }
@@ -295,8 +337,9 @@ function unlikePost(postId) {
 function updatePostLikes(postId) {
 	$.getJSON("ajax/getLikes.ajax", { "type": "post", "post": postId }, function(data, textStatus) {
 		if (data.success) {
-			$("#sone .post#" + postId + " > .status-line .likes").toggleClass("hidden", data.likes == 0)
-			$("#sone .post#" + postId + " > .status-line .likes span.like-count").text(data.likes);
+			$("#sone .post#" + postId + " > .inner-part > .status-line .likes").toggleClass("hidden", data.likes == 0)
+			$("#sone .post#" + postId + " > .inner-part > .status-line .likes span.like-count").text(data.likes);
+			$("#sone .post#" + postId + " > .inner-part > .status-line .likes > span").attr("title", generateSoneList(data.sones));
 		}
 	});
 }
@@ -322,6 +365,45 @@ function updateReplyLikes(replyId) {
 		if (data.success) {
 			$("#sone .reply#" + replyId + " .status-line .likes").toggleClass("hidden", data.likes == 0)
 			$("#sone .reply#" + replyId + " .status-line .likes span.like-count").text(data.likes);
+			$("#sone .reply#" + replyId + " .status-line .likes > span").attr("title", generateSoneList(data.sones));
+		}
+	});
+}
+
+/**
+ * Posts a reply and calls the given callback when the request finishes.
+ *
+ * @param postId
+ *            The ID of the post the reply refers to
+ * @param text
+ *            The text to post
+ * @param callbackFunction
+ *            The callback function to call when the request finishes (takes 3
+ *            parameters: success, error, replyId)
+ */
+function postReply(postId, text, callbackFunction) {
+	$.getJSON("ajax/createReply.ajax", { "formPassword" : getFormPassword(), "post" : postId, "text": text }, function(data, textStatus) {
+		if (data.success) {
+			callbackFunction(true, null, data.reply);
+		} else {
+			callbackFunction(false, data.error);
+		}
+	});
+}
+
+/**
+ * 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("ajax/getReply.ajax", { "reply" : replyId }, function(data, textStatus) {
+		if (data.success) {
+			callbackFunction(data.soneId, data.soneName, data.time, data.displayTime, data.text, data.html);
 		}
 	});
 }