Get translations of delete button texts only once.

[Sone.git] / src / main / resources / static / javascript / sone.js

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index 66314e1..7b971bb 100644 (file)
--- 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();