X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=7b971bba9e1cedabcac65cc4e59959b6265fd37f;hb=221eb70ea2ead8dab2999d3d4bdbeb3092ac58f3;hp=695503cb3bb8f94b4e86556f0212c2f61699a45c;hpb=ad54030fb89a0b74a7096e350c5428f884d28ffe;p=Sone.git

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index 695503c..7b971bb 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -112,6 +112,17 @@ function getSoneStatus(soneId) {
 }
 
 /**
+ * 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 +136,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 = {};
@@ -160,36 +171,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 +209,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 +235,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();
@@ -297,16 +310,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);
 	});
 }
@@ -314,9 +327,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 + " > .status-line .likes > span").attr("title", generateSoneList(data.sones));
+			$("#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));
 		}
 	});
 }