X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=333d9d1fb65ff005a48887de7c8df396b4a7e8b5;hp=d3741c63189d4a31ab86c7ad5f2b40a6f9b2c752;hb=HEAD;hpb=16bebcb43fb56df0ae5d7f206f9fb4032d145fc0 diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js index d3741c6..333d9d1 100644 --- a/src/main/resources/static/javascript/sone.js +++ b/src/main/resources/static/javascript/sone.js @@ -2,12 +2,12 @@ function ajaxGet(url, data, successCallback, errorCallback) { (function(url, data, successCallback, errorCallback) { - $.ajax({"cache": false, "type": "GET", "url": url, "data": data, "dataType": "json", "success": function(data, textStatus, xmlHttpRequest) { + $.ajax({"cache": false, "type": "GET", "url": url, "data": data, "dataType": "json", "success": function(data, textStatus) { ajaxSuccess(); if (typeof successCallback != "undefined") { successCallback(data, textStatus); } - }, "error": function(xmlHttpRequest, textStatus, errorThrown) { + }, "error": function(xmlHttpRequest) { if (xmlHttpRequest.status === 403) { notLoggedIn = true; } @@ -22,10 +22,10 @@ function ajaxGet(url, data, successCallback, errorCallback) { function registerInputTextareaSwap(inputElement, defaultText, inputFieldName, optional, dontUseTextarea) { $(inputElement).each(function() { - var textarea = $(dontUseTextarea ? "" : "").blur(function() { + const textarea = $(dontUseTextarea ? "" : "").blur(function() { if ($(this).val() === "") { $(this).hide(); - var inputField = $(this).data("inputField"); + const inputField = $(this).data("inputField"); inputField.show().removeAttr("disabled").addClass("default"); inputField.val(defaultText); } @@ -68,10 +68,10 @@ function addCommentLink(postId, author, element, insertAfterThisElement) { return; } (function(postId, author, insertAfterThisElement) { - var separator = $(" · ").addClass("separator"); + const separator = $(" · ").addClass("separator"); getTranslation("WebInterface.Button.Comment", function(text) { - var commentElement = $("
" + text + "
").addClass("show-reply-form").click(function() { - var replyElement = sone.find(".post#post-" + postId + " .create-reply"); + const commentElement = $("
" + text + "
").addClass("show-reply-form").click(function() { + const replyElement = sone.find(".post#post-" + postId + " .create-reply"); replyElement.removeClass("hidden"); replyElement.removeClass("light"); (function(replyElement) { @@ -83,7 +83,7 @@ function addCommentLink(postId, author, element, insertAfterThisElement) { replyElement.removeClass("light"); }); })(replyElement); - var textArea = replyElement.find(":input.reply-input").focus().data("textarea"); + const textArea = replyElement.find(":input.reply-input").focus().data("textarea"); if (author !== getCurrentSoneId()) { textArea.val(textArea.val() + "@sone://" + author + " "); } @@ -94,7 +94,7 @@ function addCommentLink(postId, author, element, insertAfterThisElement) { })(postId, author, insertAfterThisElement); } -var translations = {}; +const translations = {}; /** * Retrieves the translation for the given key and calls the callback function. @@ -110,7 +110,7 @@ function getTranslation(key, callback) { callback(translations[key]); return; } - ajaxGet("getTranslation.ajax", {"key": key}, function(data, textStatus) { + ajaxGet("getTranslation.ajax", {"key": key}, function(data) { if ((data != null) && data.success) { translations[key] = data.value; callback(data.value); @@ -145,7 +145,7 @@ function filterSoneId(soneId) { * The date and time of the last update (formatted for display) */ function updateSoneStatus(soneId, name, status, modified, locked, lastUpdated, lastUpdatedText) { - var updateSone = sone.find(".sone." + filterSoneId(soneId)); + const updateSone = sone.find(".sone." + filterSoneId(soneId)); updateSone.toggleClass("unknown", status === "unknown"). toggleClass("idle", status === "idle"). toggleClass("inserting", status === "inserting"). @@ -175,7 +175,7 @@ function updateSoneStatus(soneId, name, status, modified, locked, lastUpdated, l */ function enhanceDeleteButton(button, text, deleteCallback) { (function(button) { - var newButton = $("").addClass("confirm").hide().text(text).click(function() { + const newButton = $("").addClass("confirm").hide().text(text).click(function() { $(this).fadeOut("slow"); deleteCallback(); return false; @@ -210,7 +210,7 @@ function enhanceDeleteButton(button, text, deleteCallback) { */ function enhanceDeletePostButton(button, postId, text) { enhanceDeleteButton(button, text, function() { - ajaxGet("deletePost.ajax", { "post": postId, "formPassword": getFormPassword() }, function(data, textStatus) { + ajaxGet("deletePost.ajax", { "post": postId, "formPassword": getFormPassword() }, function(data) { if (data == null) { return; } @@ -224,7 +224,7 @@ function enhanceDeletePostButton(button, postId, text) { } else if (data.error === "not-authorized") { alert("You are not allowed to delete this post."); } - }, function(xmlHttpRequest, textStatus, error) { + }, function() { /* ignore error. */ }); }); @@ -242,7 +242,7 @@ function enhanceDeletePostButton(button, postId, text) { */ function enhanceDeleteReplyButton(button, replyId, text) { enhanceDeleteButton(button, text, function() { - ajaxGet("deleteReply.ajax", { "reply": replyId, "formPassword": sone.find("#formPassword").text() }, function(data, textStatus) { + ajaxGet("deleteReply.ajax", { "reply": replyId, "formPassword": sone.find("#formPassword").text() }, function(data) { if (data == null) { return; } @@ -256,7 +256,7 @@ function enhanceDeleteReplyButton(button, replyId, text) { } else if (data.error === "not-authorized") { alert("You are not allowed to delete this reply."); } - }, function(xmlHttpRequest, textStatus, error) { + }, function() { /* ignore error. */ }); }); @@ -274,7 +274,7 @@ function getFormPassword() { * @returns All Sone elements with the given ID */ function getSone(soneId) { - return sone.find(".sone").filter(function(index) { + return sone.find(".sone").filter(function() { return $(".id", this).text() === soneId; }); } @@ -297,21 +297,14 @@ function getMenuSone(element) { /** * Generates a list of Sones by concatening the names of the given sones with a - * new line character (“\n”). + * comma. * * @param sones * The sones to format * @returns {String} The created string */ function generateSoneList(sones) { - var soneList = ""; - $.each(sones, function() { - if (soneList != "") { - soneList += ", "; - } - soneList += this.name; - }); - return soneList; + return sones.map(sone => sone.name).join(", ") } /** @@ -438,138 +431,70 @@ function getNotificationLastUpdatedTime(notificationElement) { } function likePost(postId) { - ajaxGet("like.ajax", { "type": "post", "post" : postId, "formPassword": getFormPassword() }, function(data, textStatus) { + ajaxGet("like.ajax", { "type": "post", "post" : postId, "formPassword": getFormPassword() }, function(data) { if ((data == null) || !data.success) { return; } sone.find(".post#post-" + postId + " > .inner-part > .status-line .like").addClass("hidden"); sone.find(".post#post-" + postId + " > .inner-part > .status-line .unlike").removeClass("hidden"); updatePostLikes(postId); - }, function(xmlHttpRequest, textStatus, error) { + }, function() { /* ignore error. */ }); } function unlikePost(postId) { - ajaxGet("unlike.ajax", { "type": "post", "post" : postId, "formPassword": getFormPassword() }, function(data, textStatus) { + ajaxGet("unlike.ajax", { "type": "post", "post" : postId, "formPassword": getFormPassword() }, function(data) { if ((data == null) || !data.success) { return; } sone.find(".post#post-" + postId + " > .inner-part > .status-line .unlike").addClass("hidden"); sone.find(".post#post-" + postId + " > .inner-part > .status-line .like").removeClass("hidden"); updatePostLikes(postId); - }, function(xmlHttpRequest, textStatus, error) { + }, function() { /* ignore error. */ }); } function updatePostLikes(postId) { - ajaxGet("getLikes.ajax", { "type": "post", "post": postId }, function(data, textStatus) { + ajaxGet("getLikes.ajax", { "type": "post", "post": postId }, function(data) { if ((data != null) && data.success) { sone.find(".post#post-" + postId + " > .inner-part > .status-line .likes").toggleClass("hidden", data.likes === 0); sone.find(".post#post-" + postId + " > .inner-part > .status-line .likes span.like-count").text(data.likes); sone.find(".post#post-" + postId + " > .inner-part > .status-line .likes > span").prop("title", generateSoneList(data.sones)); } - }, function(xmlHttpRequest, textStatus, error) { + }, function() { /* ignore error. */ }); } function likeReply(replyId) { - ajaxGet("like.ajax", { "type": "reply", "reply" : replyId, "formPassword": getFormPassword() }, function(data, textStatus) { + ajaxGet("like.ajax", { "type": "reply", "reply" : replyId, "formPassword": getFormPassword() }, function(data) { if ((data == null) || !data.success) { return; } sone.find(".reply#reply-" + replyId + " .status-line .like").addClass("hidden"); sone.find(".reply#reply-" + replyId + " .status-line .unlike").removeClass("hidden"); updateReplyLikes(replyId); - }, function(xmlHttpRequest, textStatus, error) { + }, function() { /* ignore error. */ }); } function unlikeReply(replyId) { - ajaxGet("unlike.ajax", { "type": "reply", "reply" : replyId, "formPassword": getFormPassword() }, function(data, textStatus) { + ajaxGet("unlike.ajax", { "type": "reply", "reply" : replyId, "formPassword": getFormPassword() }, function(data) { if ((data == null) || !data.success) { return; } sone.find(".reply#reply-" + replyId + " .status-line .unlike").addClass("hidden"); sone.find(".reply#reply-" + replyId + " .status-line .like").removeClass("hidden"); updateReplyLikes(replyId); - }, function(xmlHttpRequest, textStatus, error) { + }, function() { /* ignore error. */ }); } /** - * Trusts the Sone with the given ID. - * - * @param soneId - * The ID of the Sone to trust - */ -function trustSone(soneId) { - ajaxGet("trustSone.ajax", { "formPassword" : getFormPassword(), "sone" : soneId }, function(data, textStatus) { - if ((data != null) && data.success) { - updateTrustControls(soneId, data.trustValue); - } - }); -} - -/** - * Distrusts the Sone with the given ID, i.e. assigns a negative trust value. - * - * @param soneId - * The ID of the Sone to distrust - */ -function distrustSone(soneId) { - ajaxGet("distrustSone.ajax", { "formPassword" : getFormPassword(), "sone" : soneId }, function(data, textStatus) { - if ((data != null) && data.success) { - updateTrustControls(soneId, data.trustValue); - } - }); -} - -/** - * Untrusts the Sone with the given ID, i.e. removes any trust assignment. - * - * @param soneId - * The ID of the Sone to untrust - */ -function untrustSone(soneId) { - ajaxGet("untrustSone.ajax", { "formPassword" : getFormPassword(), "sone" : soneId }, function(data, textStatus) { - if ((data != null) && data.success) { - updateTrustControls(soneId, data.trustValue); - } - }); -} - -/** - * Updates the trust controls for all posts and replies of the given Sone, - * according to the given trust value. - * - * @param soneId - * The ID of the Sone to update all trust controls for - * @param trustValue - * The trust value for the Sone - */ -function updateTrustControls(soneId, trustValue) { - sone.find(".post").each(function() { - if (getPostAuthor(this) === soneId) { - getPostElement(this).find(".post-trust").toggleClass("hidden", trustValue != null); - getPostElement(this).find(".post-distrust").toggleClass("hidden", trustValue != null); - getPostElement(this).find(".post-untrust").toggleClass("hidden", trustValue == null); - } - }); - sone.find(".reply").each(function() { - if (getReplyAuthor(this) === soneId) { - getReplyElement(this).find(".reply-trust").toggleClass("hidden", trustValue != null); - getReplyElement(this).find(".reply-distrust").toggleClass("hidden", trustValue != null); - getReplyElement(this).find(".reply-untrust").toggleClass("hidden", trustValue == null); - } - }); -} - -/** * Bookmarks the post with the given ID. * * @param postId @@ -577,7 +502,7 @@ function updateTrustControls(soneId, trustValue) { */ function bookmarkPost(postId) { (function(postId) { - ajaxGet("bookmark.ajax", {"formPassword": getFormPassword(), "type": "post", "post": postId}, function(data, textStatus) { + ajaxGet("bookmark.ajax", {"formPassword": getFormPassword(), "type": "post", "post": postId}, function(data) { if ((data != null) && data.success) { getPost(postId).find(".bookmark").toggleClass("hidden", true); getPost(postId).find(".unbookmark").toggleClass("hidden", false); @@ -593,7 +518,7 @@ function bookmarkPost(postId) { * The ID of the post to unbookmark */ function unbookmarkPost(postId) { - ajaxGet("unbookmark.ajax", {"formPassword": getFormPassword(), "type": "post", "post": postId}, function(data, textStatus) { + ajaxGet("unbookmark.ajax", {"formPassword": getFormPassword(), "type": "post", "post": postId}, function(data) { if ((data != null) && data.success) { getPost(postId).find(".bookmark").toggleClass("hidden", false); getPost(postId).find(".unbookmark").toggleClass("hidden", true); @@ -602,13 +527,13 @@ function unbookmarkPost(postId) { } function updateReplyLikes(replyId) { - ajaxGet("getLikes.ajax", { "type": "reply", "reply": replyId }, function(data, textStatus) { + ajaxGet("getLikes.ajax", { "type": "reply", "reply": replyId }, function(data) { if ((data != null) && data.success) { sone.find(".reply#reply-" + replyId + " .status-line .likes").toggleClass("hidden", data.likes === 0); sone.find(".reply#reply-" + replyId + " .status-line .likes span.like-count").text(data.likes); sone.find(".reply#reply-" + replyId + " .status-line .likes > span").prop("title", generateSoneList(data.sones)); } - }, function(xmlHttpRequest, textStatus, error) { + }, function() { /* ignore error. */ }); } @@ -627,7 +552,7 @@ function updateReplyLikes(replyId) { * parameters: success, error, replyId) */ function postReply(sender, postId, text, callbackFunction) { - ajaxGet("createReply.ajax", { "formPassword" : getFormPassword(), "sender": sender, "post" : postId, "text": text }, function(data, textStatus) { + ajaxGet("createReply.ajax", { "formPassword" : getFormPassword(), "sender": sender, "post" : postId, "text": text }, function(data) { if (data == null) { /* TODO - show error */ return; @@ -637,7 +562,7 @@ function postReply(sender, postId, text, callbackFunction) { } else { callbackFunction(false, data.error); } - }, function(xmlHttpRequest, textStatus, error) { + }, function() { /* ignore error. */ }); } @@ -654,7 +579,7 @@ function ajaxifySone(soneElement) { * nicer. */ $(".follow", soneElement).submit(function() { - var followElement = this; + const followElement = this; ajaxGet("followSone.ajax", { "sone": getSoneId(this), "formPassword": getFormPassword() }, function() { $(followElement).addClass("hidden"); $(followElement).parent().find(".unfollow").removeClass("hidden"); @@ -662,7 +587,7 @@ function ajaxifySone(soneElement) { return false; }); $(".unfollow", soneElement).submit(function() { - var unfollowElement = this; + const unfollowElement = this; ajaxGet("unfollowSone.ajax", { "sone": getSoneId(this), "formPassword": getFormPassword() }, function() { $(unfollowElement).addClass("hidden"); $(unfollowElement).parent().find(".follow").removeClass("hidden"); @@ -670,7 +595,7 @@ function ajaxifySone(soneElement) { return false; }); $(".lock", soneElement).submit(function() { - var lockElement = this; + const lockElement = this; ajaxGet("lockSone.ajax", { "sone" : getSoneId(this), "formPassword" : getFormPassword() }, function() { $(lockElement).addClass("hidden"); $(lockElement).parent().find(".unlock").removeClass("hidden"); @@ -678,7 +603,7 @@ function ajaxifySone(soneElement) { return false; }); $(".unlock", soneElement).submit(function() { - var unlockElement = this; + const unlockElement = this; ajaxGet("unlockSone.ajax", { "sone" : getSoneId(this), "formPassword" : getFormPassword() }, function() { $(unlockElement).addClass("hidden"); $(unlockElement).parent().find(".lock").removeClass("hidden"); @@ -692,6 +617,40 @@ function ajaxifySone(soneElement) { }); } +function followSone(soneId) { + return function() { + const followElement = this; + ajaxGet("followSone.ajax", {"sone": soneId, "formPassword": getFormPassword()}, function () { + $(followElement).addClass("hidden"); + $(followElement).parent().find(".unfollow").removeClass("hidden"); + sone.find(".sone-menu").each(function () { + if (getMenuSone(this) === soneId) { + $(".follow", this).toggleClass("hidden", true); + $(".unfollow", this).toggleClass("hidden", false); + } + }); + }); + return false; + } +} + +function unfollowSone(soneId) { + return function() { + const unfollowElement = this; + ajaxGet("unfollowSone.ajax", {"sone": soneId, "formPassword": getFormPassword()}, function () { + $(unfollowElement).addClass("hidden"); + $(unfollowElement).parent().find(".follow").removeClass("hidden"); + sone.find(".sone-menu").each(function () { + if (getMenuSone(this) === soneId) { + $(".follow", this).toggleClass("hidden", false); + $(".unfollow", this).toggleClass("hidden", true); + } + }); + }); + return false; + } +}; + /** * Ajaxifies the given post by enhancing all eligible elements with AJAX. * @@ -703,12 +662,12 @@ function ajaxifyPost(postElement) { return false; }); $(postElement).find(".create-reply button:submit").click(function() { - var button = $(this); + const button = $(this); button.prop("disabled", "disabled"); - var sender = $(this.form).find(":input[name=sender]").val(); - var inputField = $(this.form).find(":input[name=text]:enabled").get(0); - var postId = getPostId(this); - var text = $(inputField).val(); + const sender = $(this.form).find(":input[name=sender]").val(); + const inputField = $(this.form).find(":input[name=text]:enabled").get(0); + const postId = getPostId(this); + const text = $(inputField).val(); (function(sender, postId, text, inputField) { postReply(sender, postId, text, function(success, error, replyId, soneId) { if (success) { @@ -731,7 +690,7 @@ function ajaxifyPost(postElement) { /* replace all “delete” buttons with javascript. */ (function(postElement) { getTranslation("WebInterface.Confirmation.DeletePostButton", function(deletePostText) { - var postId = getPostId(postElement); + const postId = getPostId(postElement); enhanceDeletePostButton($(postElement).find(".delete-post button"), postId, deletePostText); }); })(postElement); @@ -746,20 +705,6 @@ function ajaxifyPost(postElement) { return false; }); - /* convert trust control buttons to javascript functions. */ - $(postElement).find(".post-trust").submit(function() { - trustSone(getPostAuthor(this)); - return false; - }); - $(postElement).find(".post-distrust").submit(function() { - distrustSone(getPostAuthor(this)); - return false; - }); - $(postElement).find(".post-untrust").submit(function() { - untrustSone(getPostAuthor(this)); - return false; - }); - /* convert bookmark/unbookmark buttons to javascript functions. */ $(postElement).find(".bookmark").submit(function() { bookmarkPost(getPostId(this)); @@ -773,8 +718,8 @@ function ajaxifyPost(postElement) { /* convert “show source” link into javascript function. */ $(postElement).find(".show-source").each(function() { $("a", this).click(function() { - var post = getPostElement(this); - var rawPostText = $(".post-text.raw-text", post); + const post = getPostElement(this); + const rawPostText = $(".post-text.raw-text", post); rawPostText.toggleClass("hidden"); if (rawPostText.hasClass("hidden")) { $(".post-text.short-text", post).removeClass("hidden"); @@ -792,16 +737,7 @@ function ajaxifyPost(postElement) { }); /* convert “show more” link into javascript function. */ - $(postElement).find(".expand-post-text").each(function() { - $(this).click(function() { - $(".post-text.text", getPostElement(this)).toggleClass("hidden"); - $(".post-text.short-text", getPostElement(this)).toggleClass("hidden"); - $(".expand-post-text", getPostElement(this)).toggleClass("hidden"); - $(".shrink-post-text", getPostElement(this)).toggleClass("hidden"); - return false; - }); - }); - $(postElement).find(".shrink-post-text").each(function() { + const toggleShowMore = function() { $(this).click(function() { $(".post-text.text", getPostElement(this)).toggleClass("hidden"); $(".post-text.short-text", getPostElement(this)).toggleClass("hidden"); @@ -809,12 +745,14 @@ function ajaxifyPost(postElement) { $(".shrink-post-text", getPostElement(this)).toggleClass("hidden"); return false; }); - }); + }; + $(postElement).find(".expand-post-text").each(toggleShowMore); + $(postElement).find(".shrink-post-text").each(toggleShowMore); /* ajaxify author/post links */ $(".post-status-line .permalink a", postElement).click(function() { if (!$(".create-reply", postElement).hasClass("hidden")) { - var textArea = $(":input.reply-input", postElement).focus().data("textarea"); + const textArea = $(":input.reply-input", postElement).focus().data("textarea"); $(textArea).replaceSelection($(this).prop("href")); } return false; @@ -824,7 +762,7 @@ function ajaxifyPost(postElement) { addCommentLink(getPostId(postElement), getPostAuthor(postElement), postElement, $(postElement).find(".post-status-line .permalink-author")); /* process all replies. */ - var replyIds = []; + const replyIds = []; $(postElement).find(".reply").each(function() { replyIds.push(getReplyId(this)); ajaxifyReply(this); @@ -878,35 +816,9 @@ function ajaxifyPost(postElement) { } }); (function(postElement) { - var soneId = $(".sone-menu-id:first", postElement).text(); - $(".sone-post-menu .follow", postElement).click(function() { - var followElement = this; - ajaxGet("followSone.ajax", { "sone": soneId, "formPassword": getFormPassword() }, function() { - $(followElement).addClass("hidden"); - $(followElement).parent().find(".unfollow").removeClass("hidden"); - sone.find(".sone-menu").each(function() { - if (getMenuSone(this) === soneId) { - $(".follow", this).toggleClass("hidden", true); - $(".unfollow", this).toggleClass("hidden", false); - } - }); - }); - return false; - }); - $(".sone-post-menu .unfollow", postElement).click(function() { - var unfollowElement = this; - ajaxGet("unfollowSone.ajax", { "sone": soneId, "formPassword": getFormPassword() }, function() { - $(unfollowElement).addClass("hidden"); - $(unfollowElement).parent().find(".follow").removeClass("hidden"); - sone.find(".sone-menu").each(function() { - if (getMenuSone(this) === soneId) { - $(".follow", this).toggleClass("hidden", false); - $(".unfollow", this).toggleClass("hidden", true); - } - }); - }); - return false; - }); + const soneId = $(".sone-menu-id:first", postElement).text(); + $(".sone-post-menu .follow", postElement).click(followSone(soneId)); + $(".sone-post-menu .unfollow", postElement).click(unfollowSone(soneId)); })(postElement); } @@ -936,7 +848,7 @@ function ajaxifyReply(replyElement) { /* ajaxify author links */ $(".reply-status-line .permalink a", replyElement).click(function() { if (!$(".create-reply", getPostElement(replyElement)).hasClass("hidden")) { - var textArea = $(":input.reply-input", getPostElement(replyElement)).focus().data("textarea"); + const textArea = $(":input.reply-input", getPostElement(replyElement)).focus().data("textarea"); $(textArea).replaceSelection($(this).prop("href")); } return false; @@ -947,8 +859,8 @@ function ajaxifyReply(replyElement) { /* convert “show source” link into javascript function. */ $(replyElement).find(".show-reply-source").each(function() { $("a", this).click(function() { - var reply = getReplyElement(this); - var rawReplyText = $(".reply-text.raw-text", reply); + const reply = getReplyElement(this); + const rawReplyText = $(".reply-text.raw-text", reply); rawReplyText.toggleClass("hidden"); if (rawReplyText.hasClass("hidden")) { $(".reply-text.short-text", reply).removeClass("hidden"); @@ -966,7 +878,7 @@ function ajaxifyReply(replyElement) { }); /* convert “show more” link into javascript function. */ - $(replyElement).find(".expand-reply-text").each(function() { + const toggleShowMore = function() { $(this).click(function() { $(".reply-text.text", getReplyElement(this)).toggleClass("hidden"); $(".reply-text.short-text", getReplyElement(this)).toggleClass("hidden"); @@ -974,30 +886,9 @@ function ajaxifyReply(replyElement) { $(".shrink-reply-text", getReplyElement(this)).toggleClass("hidden"); return false; }); - }); - $(replyElement).find(".shrink-reply-text").each(function() { - $(this).click(function() { - $(".reply-text.text", getReplyElement(this)).toggleClass("hidden"); - $(".reply-text.short-text", getReplyElement(this)).toggleClass("hidden"); - $(".expand-reply-text", getReplyElement(this)).toggleClass("hidden"); - $(".shrink-reply-text", getReplyElement(this)).toggleClass("hidden"); - return false; - }); - }); - - /* convert trust control buttons to javascript functions. */ - $(replyElement).find(".reply-trust").submit(function() { - trustSone(getReplyAuthor(this)); - return false; - }); - $(replyElement).find(".reply-distrust").submit(function() { - distrustSone(getReplyAuthor(this)); - return false; - }); - $(replyElement).find(".reply-untrust").submit(function() { - untrustSone(getReplyAuthor(this)); - return false; - }); + }; + $(replyElement).find(".expand-reply-text").each(toggleShowMore); + $(replyElement).find(".shrink-reply-text").each(toggleShowMore); /* show Sone menu when hovering over the avatar. */ $(replyElement).find(".reply-avatar").mouseover(function() { @@ -1017,35 +908,9 @@ function ajaxifyReply(replyElement) { } }); (function(replyElement) { - var soneId = $(".sone-menu-id", replyElement).text(); - $(".sone-menu .follow", replyElement).click(function() { - var followElement = this; - ajaxGet("followSone.ajax", { "sone": soneId, "formPassword": getFormPassword() }, function() { - $(followElement).addClass("hidden"); - $(followElement).parent().find(".unfollow").removeClass("hidden"); - sone.find(".sone-menu").each(function() { - if (getMenuSone(this) === soneId) { - $(".follow", this).toggleClass("hidden", true); - $(".unfollow", this).toggleClass("hidden", false); - } - }); - }); - return false; - }); - $(".sone-menu .unfollow", replyElement).click(function() { - var unfollowElement = this; - ajaxGet("unfollowSone.ajax", { "sone": soneId, "formPassword": getFormPassword() }, function() { - $(unfollowElement).addClass("hidden"); - $(unfollowElement).parent().find(".follow").removeClass("hidden"); - sone.find(".sone-menu").each(function() { - if (getMenuSone(this) === soneId) { - $(".follow", this).toggleClass("hidden", false); - $(".unfollow", this).toggleClass("hidden", true); - } - }); - }); - return false; - }); + const soneId = $(".sone-menu-id", replyElement).text(); + $(".sone-menu .follow", replyElement).click(followSone(soneId)); + $(".sone-menu .unfollow", replyElement).click(unfollowSone(soneId)); })(replyElement); } @@ -1065,26 +930,26 @@ function ajaxifyNotification(notification) { notification.find(".text").addClass("hidden"); } notification.find("form.mark-as-read button").click(function() { - var allIds = $(":input[name=id]", this.form).val().split(" "); - for (var index = 0; index < allIds.length; index += 16) { - var ids = allIds.slice(index, index + 16).join(" "); + const allIds = $(":input[name=id]", this.form).val().split(" "); + for (let index = 0; index < allIds.length; index += 16) { + const ids = allIds.slice(index, index + 16).join(" "); ajaxGet("markAsKnown.ajax", {"formPassword": getFormPassword(), "type": $(":input[name=type]", this.form).val(), "id": ids}); } }); notification.find("a[class^='link-']").each(function() { - var linkElement = $(this); + const linkElement = $(this); if (linkElement.is("[href^='viewPost']")) { - var id = linkElement.prop("class").substr(5); + const id = linkElement.prop("class").substr(5); if (hasPost(id)) { linkElement.prop("href", "#post-" + id).addClass("in-page-link"); } } }); notification.find("form.dismiss button").click(function() { - ajaxGet("dismissNotification.ajax", { "formPassword" : getFormPassword(), "notification" : notification.prop("id") }, function(data, textStatus) { + ajaxGet("dismissNotification.ajax", { "formPassword" : getFormPassword(), "notification" : notification.prop("id") }, function() { /* dismiss in case of error, too. */ notification.slideUp(); - }, function(xmlHttpRequest, textStatus, error) { + }, function() { /* ignore error. */ }); }); @@ -1119,7 +984,7 @@ function setNotificationHash(notificationHash) { * @returns All extracted IDs */ function getElementIds(notification, selector) { - var elementIds = []; + const elementIds = []; $(selector, notification).each(function() { elementIds.push($(this).text()); }); @@ -1139,8 +1004,8 @@ function checkForRemovedSones(oldNotification, newNotification) { if (getNotificationId(oldNotification) !== "new-sone-notification") { return; } - var oldIds = getElementIds(oldNotification, ".new-sone-id"); - var newIds = getElementIds(newNotification, ".new-sone-id"); + const oldIds = getElementIds(oldNotification, ".new-sone-id"); + const newIds = getElementIds(newNotification, ".new-sone-id"); $.each(oldIds, function(index, value) { if ($.inArray(value, newIds) === -1) { markSoneAsKnown(getSone(value), true); @@ -1161,8 +1026,8 @@ function checkForRemovedPosts(oldNotification, newNotification) { if (getNotificationId(oldNotification) !== "new-post-notification") { return; } - var oldIds = getElementIds(oldNotification, ".post-id"); - var newIds = getElementIds(newNotification, ".post-id"); + const oldIds = getElementIds(oldNotification, ".post-id"); + const newIds = getElementIds(newNotification, ".post-id"); $.each(oldIds, function(index, value) { if ($.inArray(value, newIds) === -1) { markPostAsKnown(getPost(value), true); @@ -1184,8 +1049,8 @@ function checkForRemovedReplies(oldNotification, newNotification) { if (getNotificationId(oldNotification) !== "new-reply-notification") { return; } - var oldIds = getElementIds(oldNotification, ".reply-id"); - var newIds = getElementIds(newNotification, ".reply-id"); + const oldIds = getElementIds(oldNotification, ".reply-id"); + const newIds = getElementIds(newNotification, ".reply-id"); $.each(oldIds, function(index, value) { if ($.inArray(value, newIds) === -1) { markReplyAsKnown(getReply(value), true); @@ -1194,13 +1059,13 @@ function checkForRemovedReplies(oldNotification, newNotification) { } function getStatus() { - var parameters = isViewSonePage() ? {"soneIds": getShownSoneId() } : isKnownSonesPage() ? {"soneIds": getShownSoneIds() } : {}; + const parameters = isViewSonePage() ? {"soneIds": getShownSoneId()} : isKnownSonesPage() ? {"soneIds": getShownSoneIds()} : {}; $.extend(parameters, { "elements": JSON.stringify($(".linked-element.not-loaded").map(function () { return $(this).prop("title"); }).toArray()) }); - ajaxGet("getStatus.ajax", parameters, function(data, textStatus) { + ajaxGet("getStatus.ajax", parameters, function(data) { if ((data != null) && data.success) { /* process Sone information. */ $.each(data.sones, function(index, value) { @@ -1219,7 +1084,7 @@ function getStatus() { }); /* process new replies. */ $.each(data.newReplies, function(index, value) { - loadNewReply(value.id, value.sone, value.post, value.postSone); + loadNewReply(value.id, value.sone, value.post); }); } if (data.linkedElements) { @@ -1238,12 +1103,12 @@ function getStatus() { } function requestNotifications() { - ajaxGet("getNotifications.ajax", {}, function(data, textStatus) { + ajaxGet("getNotifications.ajax", {}, function(data) { if (data && data.success) { /* search for removed notifications. */ sone.find("#notification-area .notification").each(function() { - var notificationId = $(this).prop("id"); - var foundNotification = false; + const notificationId = $(this).prop("id"); + let foundNotification = false; $.each(data.notifications, function(index, value) { if (value.id === notificationId) { foundNotification = true; @@ -1252,18 +1117,18 @@ function requestNotifications() { }); if (!foundNotification) { if (notificationId === "new-sone-notification" && (data.options["ShowNotification/NewSones"] === true)) { - $(".new-sone-id", this).each(function(index, element) { - var soneId = $(this).text(); + $(".new-sone-id", this).each(function() { + const soneId = $(this).text(); markSoneAsKnown(getSone(soneId), true); }); } else if (notificationId === "new-post-notification" && (data.options["ShowNotification/NewPosts"] === true)) { - $(".post-id", this).each(function(index, element) { - var postId = $(this).text(); + $(".post-id", this).each(function() { + const postId = $(this).text(); markPostAsKnown(getPost(postId), true); }); } else if (notificationId === "new-reply-notification" && (data.options["ShowNotification/NewReplies"] === true)) { - $(".reply-id", this).each(function(index, element) { - var replyId = $(this).text(); + $(".reply-id", this).each(function() { + const replyId = $(this).text(); markReplyAsKnown(getReply(replyId), true); }); } @@ -1278,11 +1143,11 @@ function requestNotifications() { }); /* process notifications. */ $.each(data.notifications, function(index, value) { - var oldNotification = getNotification(value.id); - var notification = ajaxifyNotification(createNotification(value.id, value.lastUpdatedTime, value.text, value.dismissable)).hide(); + const oldNotification = getNotification(value.id); + const notification = ajaxifyNotification(createNotification(value.id, value.lastUpdatedTime, value.text, value.dismissable)).hide(); if (oldNotification.length !== 0) { if ((oldNotification.find(".short-text").length > 0) && (notification.find(".short-text").length > 0)) { - var opened = oldNotification.is(":visible") && oldNotification.find(".short-text").hasClass("hidden"); + const opened = oldNotification.is(":visible") && oldNotification.find(".short-text").hasClass("hidden"); notification.find(".short-text").toggleClass("hidden", opened); notification.find(".text").toggleClass("hidden", !opened); } @@ -1316,7 +1181,7 @@ function getCurrentSoneId() { /** * Returns the content of the page-id attribute. * - * @returns The page ID + * @returns String The page ID */ function getPageId() { return sone.find(".page-id").text(); @@ -1341,7 +1206,7 @@ function isIndexPage() { * @returns The current page of the pagination */ function getPage(paginationSelector) { - var pagination = $(paginationSelector); + const pagination = $(paginationSelector); if (pagination.length > 0) { return $(".current-page", paginationSelector).text(); } @@ -1375,7 +1240,7 @@ function getShownSoneId() { * @returns The ID of the currently shown Sones */ function getShownSoneIds() { - var soneIds = []; + const soneIds = []; sone.find("#known-sones .sone .id").each(function() { soneIds.push($(this).text()); }); @@ -1450,7 +1315,7 @@ function loadNewPost(postId, soneId, recipientId, time) { if (getPostTime(sone.find(".post").last()) > time) { return; } - ajaxGet("getPost.ajax", { "post" : postId }, function(data, textStatus) { + ajaxGet("getPost.ajax", { "post" : postId }, function(data) { if ((data != null) && data.success) { if (hasPost(data.post.id)) { return; @@ -1458,14 +1323,14 @@ function loadNewPost(postId, soneId, recipientId, time) { if ((!isIndexPage() || (getPage(".pagination-index") > 1)) && !(isViewSonePage() && ((getShownSoneId() === data.post.sone) || (getShownSoneId() === data.post.recipient) || (getPage(".post-navigation") > 1)))) { return; } - var firstOlderPost = null; + let firstOlderPost = null; sone.find(".post").each(function() { if (getPostTime(this) < data.post.time) { firstOlderPost = $(this); return false; } }); - var newPost = $(data.post.html).addClass("hidden"); + const newPost = $(data.post.html).addClass("hidden"); if ($(".post-author-local", newPost).text() === "true") { newPost.removeClass("new"); } @@ -1480,28 +1345,28 @@ function loadNewPost(postId, soneId, recipientId, time) { }); } -function loadNewReply(replyId, soneId, postId, postSoneId) { +function loadNewReply(replyId, soneId, postId) { if (hasReply(replyId)) { return; } if (!hasPost(postId)) { return; } - ajaxGet("getReply.ajax", { "reply": replyId }, function(data, textStatus) { + ajaxGet("getReply.ajax", { "reply": replyId }, function(data) { /* find post. */ if ((data != null) && data.success) { if (hasReply(data.reply.id)) { return; } sone.find(".post#post-" + data.reply.postId).each(function() { - var firstNewerReply = null; + let firstNewerReply = null; $(this).find(".replies .reply").each(function() { if (getReplyTime(this) > data.reply.time) { firstNewerReply = $(this); return false; } }); - var newReply = $(data.reply.html).addClass("hidden"); + const newReply = $(data.reply.html).addClass("hidden"); if ($(".reply-author-local", newReply).text() === "true") { newReply.removeClass("new"); (function(newReply) { @@ -1530,7 +1395,7 @@ function loadNewReply(replyId, soneId, postId, postSoneId) { } function loadLinkedElements(links) { - var failedElements = links.filter(function(element) { + const failedElements = links.filter(function(element) { return element.failed; }); if (failedElements.length > 0) { @@ -1540,7 +1405,7 @@ function loadLinkedElements(links) { }); }); } - var loadedElements = links.filter(function(element) { + const loadedElements = links.filter(function(element) { return !element.loading && !element.failed; }); if (loadedElements.length > 0) { @@ -1548,7 +1413,7 @@ function loadLinkedElements(links) { "elements": JSON.stringify(loadedElements.map(function(element) { return element.link; })) - }, function (data, textStatus) { + }, function (data) { if ((data != null) && (data.success)) { data.linkedElements.forEach(function (linkedElement) { getLinkedElements(linkedElement.link).each(function() { @@ -1585,7 +1450,7 @@ function markSoneAsKnown(soneElement, skipRequest) { function markPostAsKnown(postElements, skipRequest) { $(postElements).each(function() { - var postElement = this; + const postElement = this; if ($(postElement).hasClass("new") || ((typeof skipRequest != "undefined"))) { (function(postElement) { $(postElement).removeClass("new"); @@ -1602,7 +1467,7 @@ function markPostAsKnown(postElements, skipRequest) { function markReplyAsKnown(replyElements, skipRequest) { $(replyElements).each(function() { - var replyElement = this; + const replyElement = this; if ($(replyElement).hasClass("new") || ((typeof skipRequest != "undefined"))) { (function(replyElement) { $(replyElement).removeClass("new"); @@ -1647,7 +1512,7 @@ function updatePostTime(postId, timeText, refreshTime, tooltip) { */ function updatePostTimes(postIds) { if (postIds !== "") { - ajaxGet("getTimes.ajax", {"posts": postIds}, function (data, textStatus) { + ajaxGet("getTimes.ajax", {"posts": postIds}, function (data) { if ((data != null) && data.success) { $.each(data.postTimes, function (index, value) { updatePostTime(index, value.timeText, value.refreshTime, value.tooltip); @@ -1660,7 +1525,7 @@ function updatePostTimes(postIds) { /** * Updates the time of the reply with the given ID. * - * @param postId + * @param replyId * The ID of the reply to update * @param timeText * The text of the time to show @@ -1681,12 +1546,12 @@ function updateReplyTime(replyId, timeText, refreshTime, tooltip) { /** * Requests new rendered times for the posts with the given IDs. * - * @param postIds + * @param replyIds * Comma-separated post IDs */ function updateReplyTimes(replyIds) { if (replyIds !== "") { - ajaxGet("getTimes.ajax", {"replies": replyIds}, function (data, textStatus) { + ajaxGet("getTimes.ajax", {"replies": replyIds}, function (data) { if ((data != null) && data.success) { $.each(data.replyTimes, function (index, value) { updateReplyTime(index, value.timeText, value.refreshTime, value.tooltip); @@ -1697,7 +1562,7 @@ function updateReplyTimes(replyIds) { } function resetActivity() { - var title = document.title; + const title = document.title; if (title.indexOf('(') === 0) { setTitle(title.substr(title.indexOf(' ') + 1)); } @@ -1706,7 +1571,7 @@ function resetActivity() { function setActivity() { if (!focus) { - var title = document.title; + const title = document.title; if (title.indexOf('(') !== 0) { setTitle("(!) " + title); } @@ -1730,10 +1595,10 @@ function setTitle(title) { } /** Whether the icon is currently showing activity. */ -var iconActive = false; +let iconActive = false; /** Whether the icon is currently supposed to blink. */ -var iconBlinking = false; +let iconBlinking = false; /** * Toggles the icon. If the window has gained focus and the icon is still @@ -1777,9 +1642,9 @@ function changeIcon(iconUrl) { * user */ function createNotification(id, lastUpdatedTime, text, dismissable) { - var notification = $("
").addClass("notification").prop("id", id).prop("lastUpdatedTime", lastUpdatedTime); + const notification = $("
").addClass("notification").prop("id", id).prop("lastUpdatedTime", lastUpdatedTime); if (dismissable) { - var dismissForm = sone.find("#notification-area #notification-dismiss-template").clone().removeClass("hidden").removeAttr("id"); + const dismissForm = sone.find("#notification-area #notification-dismiss-template").clone().removeClass("hidden").removeAttr("id"); dismissForm.find("input[name=notification]").val(id); notification.append(dismissForm); } @@ -1805,7 +1670,7 @@ function showNotificationDetails(notificationId) { * The ID of the field to delete */ function deleteProfileField(fieldId) { - ajaxGet("deleteProfileField.ajax", {"formPassword": getFormPassword(), "field": fieldId}, function(data, textStatus) { + ajaxGet("deleteProfileField.ajax", {"formPassword": getFormPassword(), "field": fieldId}, function(data) { if (data && data.success) { sone.find(".profile-field#" + data.field.id).slideUp(); } @@ -1823,7 +1688,7 @@ function deleteProfileField(fieldId) { * Called when the renaming was successful */ function editProfileField(fieldId, newName, successFunction) { - ajaxGet("editProfileField.ajax", {"formPassword": getFormPassword(), "field": fieldId, "name": newName}, function(data, textStatus) { + ajaxGet("editProfileField.ajax", {"formPassword": getFormPassword(), "field": fieldId, "name": newName}, function(data) { if (data && data.success) { successFunction(); } @@ -1841,7 +1706,7 @@ function editProfileField(fieldId, newName, successFunction) { * Function to call on success */ function moveProfileField(fieldId, direction, successFunction) { - ajaxGet("moveProfileField.ajax", {"formPassword": getFormPassword(), "field": fieldId, "direction": direction}, function(data, textStatus) { + ajaxGet("moveProfileField.ajax", {"formPassword": getFormPassword(), "field": fieldId, "direction": direction}, function(data) { if (data && data.success) { successFunction(); } @@ -1872,7 +1737,7 @@ function moveProfileFieldDown(fieldId, successFunction) { moveProfileField(fieldId, "down", successFunction); } -var statusRequestQueued = true; +let statusRequestQueued = true; /** * Sets the status of the web interface as offline. @@ -1915,24 +1780,24 @@ function showOfflineMarker(visible) { // EVERYTHING BELOW HERE IS EXECUTED AFTER LOADING THE PAGE // -var sone = $("#sone"); -var focus = true; -var online = true; -var initiallyLoggedIn = sone.find("#loggedIn").text() === "true"; -var notLoggedIn = !initiallyLoggedIn; +const sone = $("#sone"); +let focus = true; +let online = true; +const initiallyLoggedIn = sone.find("#loggedIn").text() === "true"; +let notLoggedIn = !initiallyLoggedIn; /** ID of the next-to-show Sone context menu. */ -var currentSoneMenuId; +let currentSoneMenuId; /** Timeout handler for the next-to-show Sone context menu. */ -var currentSoneMenuTimeoutHandler; +let currentSoneMenuTimeoutHandler; $(document).ready(function() { /* rip out the status update textarea. */ sone.find(".rip-out").each(function() { - var oldElement = $(this); - var newElement = $(""); + const oldElement = $(this); + const newElement = $(""); newElement.prop("class", oldElement.prop("class")).prop("name", oldElement.prop("name")); oldElement.before(newElement).remove(); }); @@ -1948,14 +1813,14 @@ $(document).ready(function() { return false; }); sone.find("#update-status").submit(function() { - var button = $("button:submit", this); + const button = $("button:submit", this); button.prop("disabled", "disabled"); if ($(this).find(":input.default:enabled").length > 0) { return false; } - var sender = $(this).find(":input[name=sender]").val(); - var text = $(this).find(":input[name=text]:enabled").val(); - ajaxGet("createPost.ajax", { "formPassword": getFormPassword(), "sender": sender, "text": text }, function(data, textStatus) { + const sender = $(this).find(":input[name=sender]").val(); + const text = $(this).find(":input[name=text]:enabled").val(); + ajaxGet("createPost.ajax", { "formPassword": getFormPassword(), "sender": sender, "text": text }, function() { button.removeAttr("disabled"); }); $(this).find(":input[name=sender]").val(getCurrentSoneId()); @@ -1982,8 +1847,8 @@ $(document).ready(function() { return false; }); sone.find("#post-message").submit(function() { - var sender = $(this).find(":input[name=sender]").val(); - var text = $(this).find(":input[name=text]:enabled").val(); + const sender = $(this).find(":input[name=sender]").val(); + const text = $(this).find(":input[name=text]:enabled").val(); ajaxGet("createPost.ajax", { "formPassword": getFormPassword(), "recipient": getShownSoneId(), "sender": sender, "text": text }); $(this).find(":input[name=sender]").val(getCurrentSoneId()); $(this).find(":input[name=text]:enabled").val("").blur(); @@ -2008,7 +1873,7 @@ $(document).ready(function() { }); /* update post times. */ - var postIds = []; + const postIds = []; sone.find(".post").each(function() { postIds.push(getPostId(this)); }); @@ -2018,14 +1883,14 @@ $(document).ready(function() { if (!isViewPostPage()) { getTranslation("WebInterface.ClickToShow.Replies", function(text) { sone.find(".post .replies").each(function() { - var allReplies = $(this).find(".reply"); + const allReplies = $(this).find(".reply"); if (allReplies.length > 2) { - var newHidden = false; - for (var replyIndex = 0; replyIndex < (allReplies.length - 2); ++replyIndex) { + let newHidden = false; + for (let replyIndex = 0; replyIndex < (allReplies.length - 2); ++replyIndex) { $(allReplies[replyIndex]).addClass("hidden"); newHidden |= $(allReplies[replyIndex]).hasClass("new"); } - var clickToShowElement = $("
").addClass("click-to-show"); + const clickToShowElement = $("
").addClass("click-to-show"); if (newHidden) { clickToShowElement.addClass("new"); }