X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=05ab5a00480736d293510bd9e332f356d16351cd;hb=e9a2ac5f932a9c49685d218b5edaad8d6dd79d22;hp=dedb5104d2c2ea5f06283e2a5cc90f8d480312bb;hpb=16a69fdf1e4d4b7852ca8e2abdfd09470207ec6b;p=Sone.git
diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index dedb510..05ab5a0 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -4,9 +4,9 @@ function isOnline() {
return $("#sone").hasClass("online");
}
-function registerInputTextareaSwap(inputSelector, defaultText, inputFieldName, optional) {
+function registerInputTextareaSwap(inputSelector, defaultText, inputFieldName, optional, dontUseTextarea) {
$(inputSelector).each(function() {
- textarea = $("").blur(function() {
+ textarea = $(dontUseTextarea ? "" : "").blur(function() {
if ($(this).val() == "") {
$(this).hide();
inputField = $(this).data("inputField");
@@ -99,7 +99,7 @@ function getTranslation(key, callback) {
*/
function getSoneStatus(soneId) {
$.getJSON("ajax/getSoneStatus.ajax", {"sone": soneId}, function(data, textStatus) {
- updateSoneStatus(soneId, data.status, data.modified, data.lastUpdated);
+ updateSoneStatus(soneId, data.name, data.status, data.modified, data.lastUpdated);
/* seconds! */
updateInterval = 60;
if (data.modified || (data.status == "downloading") || (data.status == "inserting")) {
@@ -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
@@ -124,14 +135,15 @@ function getSoneStatus(soneId) {
* @param lastUpdated
* The date and time of the last update (formatted for display)
*/
-function updateSoneStatus(soneId, status, modified, lastUpdated) {
- $("#sone .sone." + soneId).
+function updateSoneStatus(soneId, name, status, modified, lastUpdated) {
+ $("#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." + filterSoneId(soneId) + " .last-update span.time").text(lastUpdated);
+ $("#sone .sone." + filterSoneId(soneId) + " .profile-link a").text(name);
}
var watchedSones = {};
@@ -249,6 +261,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
@@ -277,16 +308,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);
});
}
@@ -294,8 +325,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));
}
});
}
@@ -321,6 +353,7 @@ 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));
}
});
}