X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=66314e1982479094f66cf3d23364fcbaa55632af;hb=02b72e2a9a8537f64570f05419e177d821d39598;hp=715f6c37e8f94f8cedec4c28fa8a29f1c63867b0;hpb=cb0b0e06ada73b22db31a37b0ba49d950bc7aeef;p=Sone.git diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js index 715f6c3..66314e1 100644 --- a/src/main/resources/static/javascript/sone.js +++ b/src/main/resources/static/javascript/sone.js @@ -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")) { @@ -124,7 +124,7 @@ function getSoneStatus(soneId) { * @param lastUpdated * The date and time of the last update (formatted for display) */ -function updateSoneStatus(soneId, status, modified, lastUpdated) { +function updateSoneStatus(soneId, name, status, modified, lastUpdated) { $("#sone .sone." + soneId). toggleClass("unknown", status == "unknown"). toggleClass("idle", status == "idle"). @@ -132,6 +132,7 @@ function updateSoneStatus(soneId, status, modified, lastUpdated) { toggleClass("downloading", status == "downloading"). toggleClass("modified", modified); $("#sone .sone." + soneId + " .last-update span.time").text(lastUpdated); + $("#sone .sone." + soneId + " .profile-link a").text(name); } var watchedSones = {}; @@ -249,6 +250,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 +297,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 +314,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 +342,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)); } }); }