X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=a7bfe08fe40a99b35e696fb58c0421389e42b110;hb=845b4d3af981ae2974528273769ff3d8b1f90ccf;hp=20386f7d67b2a138da3554968e2fa287b9e1218a;hpb=5867507cdc8c401b17d2a4118197887de9d53c20;p=Sone.git

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index 20386f7..a7bfe08 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -1,5 +1,24 @@
 /* Sone JavaScript functions. */
 
+/* jQuery overrides. */
+oldGetJson = jQuery.prototype.getJSON;
+jQuery.prototype.getJSON = function(url, data, successCallback, errorCallback) {
+	if (typeof errorCallback == "undefined") {
+		return oldGetJson(url, data, successCallback);
+	}
+	if (jQuery.isFunction(data)) {
+		errorCallback = successCallback;
+		successCallback = data;
+		data = null;
+	}
+	return jQuery.ajax({
+		data: data,
+		error: errorCallback,
+		success: successCallback,
+		url: url
+	});
+}
+
 function isOnline() {
 	return $("#sone").hasClass("online");
 }
@@ -91,7 +110,11 @@ function addCommentLink(postId, element) {
  */
 function getTranslation(key, callback) {
 	$.getJSON("ajax/getTranslation.ajax", {"key": key}, function(data, textStatus) {
-		callback(data.value);
+		if ((data != null) && data.success) {
+			callback(data.value);
+		}
+	}, function(xmlHttpRequest, textStatus, error) {
+		/* ignore error. */
 	});
 }
 
@@ -106,15 +129,19 @@ function getTranslation(key, callback) {
  */
 function getSoneStatus(soneId, local) {
 	$.getJSON("ajax/getSoneStatus.ajax", {"sone": soneId}, function(data, textStatus) {
-		updateSoneStatus(soneId, data.name, data.status, data.modified, data.lastUpdated);
+		if ((data != null) && data.success) {
+			updateSoneStatus(soneId, data.name, data.status, data.modified, data.lastUpdated);
+		}
 		/* seconds! */
 		updateInterval = 60;
-		if (local || data.modified || (data.status == "downloading") || (data.status == "inserting")) {
+		if (local || (data!= null) && (data.modified || (data.status == "downloading") || (data.status == "inserting"))) {
 			updateInterval = 5;
 		}
 		setTimeout(function() {
 			getSoneStatus(soneId, local);
 		}, updateInterval * 1000);
+	}, function(xmlHttpRequest, textStatus, error) {
+		/* ignore error. */
 	});
 }
 
@@ -225,6 +252,9 @@ function enhanceDeleteButton(buttonId, text, deleteCallback) {
 function enhanceDeletePostButton(buttonId, postId, text) {
 	enhanceDeleteButton(buttonId, text, function() {
 		$.getJSON("ajax/deletePost.ajax", { "post": postId, "formPassword": $("#sone #formPassword").text() }, function(data, textStatus) {
+			if (data == null) {
+				return;
+			}
 			if (data.success) {
 				$("#sone .post#" + postId).slideUp();
 			} else if (data.error == "invalid-post-id") {
@@ -234,6 +264,8 @@ function enhanceDeletePostButton(buttonId, postId, text) {
 			} else if (data.error == "not-authorized") {
 				alert("You are not allowed to delete this post.");
 			}
+		}, function(xmlHttpRequest, textStatus, error) {
+			/* ignore error. */
 		});
 	});
 }
@@ -251,6 +283,9 @@ function enhanceDeletePostButton(buttonId, postId, text) {
 function enhanceDeleteReplyButton(buttonId, replyId, text) {
 	enhanceDeleteButton(buttonId, text, function() {
 		$.getJSON("ajax/deleteReply.ajax", { "reply": replyId, "formPassword": $("#sone #formPassword").text() }, function(data, textStatus) {
+			if (data == null) {
+				return;
+			}
 			if (data.success) {
 				$("#sone .reply#" + replyId).slideUp();
 			} else if (data.error == "invalid-reply-id") {
@@ -260,6 +295,8 @@ function enhanceDeleteReplyButton(buttonId, replyId, text) {
 			} else if (data.error == "not-authorized") {
 				alert("You are not allowed to delete this reply.");
 			}
+		}, function(xmlHttpRequest, textStatus, error) {
+			/* ignore error. */
 		});
 	});
 }
@@ -319,54 +356,78 @@ function getReplyId(element) {
 }
 
 function likePost(postId) {
-	$.getJSON("ajax/like.ajax", { "type": "post", "post" : postId, "formPassword": getFormPassword() }, function() {
+	$.getJSON("ajax/like.ajax", { "type": "post", "post" : postId, "formPassword": getFormPassword() }, function(data, textStatus) {
+		if ((data == null) || !data.success) {
+			return;
+		}
 		$("#sone .post#" + postId + " > .inner-part > .status-line .like").addClass("hidden");
 		$("#sone .post#" + postId + " > .inner-part > .status-line .unlike").removeClass("hidden");
 		updatePostLikes(postId);
+	}, function(xmlHttpRequest, textStatus, error) {
+		/* ignore error. */
 	});
 }
 
 function unlikePost(postId) {
-	$.getJSON("ajax/unlike.ajax", { "type": "post", "post" : postId, "formPassword": getFormPassword() }, function() {
+	$.getJSON("ajax/unlike.ajax", { "type": "post", "post" : postId, "formPassword": getFormPassword() }, function(data, textStatus) {
+		if ((data == null) || !data.success) {
+			return;
+		}
 		$("#sone .post#" + postId + " > .inner-part > .status-line .unlike").addClass("hidden");
 		$("#sone .post#" + postId + " > .inner-part > .status-line .like").removeClass("hidden");
 		updatePostLikes(postId);
+	}, function(xmlHttpRequest, textStatus, error) {
+		/* ignore error. */
 	});
 }
 
 function updatePostLikes(postId) {
 	$.getJSON("ajax/getLikes.ajax", { "type": "post", "post": postId }, function(data, textStatus) {
-		if (data.success) {
+		if ((data != null) && data.success) {
 			$("#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));
 		}
+	}, function(xmlHttpRequest, textStatus, error) {
+		/* ignore error. */
 	});
 }
 
 function likeReply(replyId) {
-	$.getJSON("ajax/like.ajax", { "type": "reply", "reply" : replyId, "formPassword": getFormPassword() }, function() {
+	$.getJSON("ajax/like.ajax", { "type": "reply", "reply" : replyId, "formPassword": getFormPassword() }, function(data, textStatus) {
+		if ((data == null) || !data.success) {
+			return;
+		}
 		$("#sone .reply#" + replyId + " .status-line .like").addClass("hidden");
 		$("#sone .reply#" + replyId + " .status-line .unlike").removeClass("hidden");
 		updateReplyLikes(replyId);
+	}, function(xmlHttpRequest, textStatus, error) {
+		/* ignore error. */
 	});
 }
 
 function unlikeReply(replyId) {
-	$.getJSON("ajax/unlike.ajax", { "type": "reply", "reply" : replyId, "formPassword": getFormPassword() }, function() {
+	$.getJSON("ajax/unlike.ajax", { "type": "reply", "reply" : replyId, "formPassword": getFormPassword() }, function(data, textStatus) {
+		if ((data == null) || !data.success) {
+			return;
+		}
 		$("#sone .reply#" + replyId + " .status-line .unlike").addClass("hidden");
 		$("#sone .reply#" + replyId + " .status-line .like").removeClass("hidden");
 		updateReplyLikes(replyId);
+	}, function(xmlHttpRequest, textStatus, error) {
+		/* ignore error. */
 	});
 }
 
 function updateReplyLikes(replyId) {
 	$.getJSON("ajax/getLikes.ajax", { "type": "reply", "reply": replyId }, function(data, textStatus) {
-		if (data.success) {
+		if ((data != null) && 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));
 		}
+	}, function(xmlHttpRequest, textStatus, error) {
+		/* ignore error. */
 	});
 }
 
@@ -383,11 +444,17 @@ function updateReplyLikes(replyId) {
  */
 function postReply(postId, text, callbackFunction) {
 	$.getJSON("ajax/createReply.ajax", { "formPassword" : getFormPassword(), "post" : postId, "text": text }, function(data, textStatus) {
+		if (data == null) {
+			/* TODO - show error */
+			return;
+		}
 		if (data.success) {
 			callbackFunction(true, null, data.reply);
 		} else {
 			callbackFunction(false, data.error);
 		}
+	}, function(xmlHttpRequest, textStatus, error) {
+		/* ignore error. */
 	});
 }
 
@@ -402,9 +469,11 @@ function postReply(postId, text, callbackFunction) {
  */
 function getReply(replyId, callbackFunction) {
 	$.getJSON("ajax/getReply.ajax", { "reply" : replyId }, function(data, textStatus) {
-		if (data.success) {
+		if ((data != null) && data.success) {
 			callbackFunction(data.soneId, data.soneName, data.time, data.displayTime, data.text, data.html);
 		}
+	}, function(xmlHttpRequest, textStatus, error) {
+		/* ignore error. */
 	});
 }
 
@@ -420,7 +489,10 @@ function ajaxifyNotification(notification) {
 	});
 	notification.find("form.dismiss button").click(function() {
 		$.getJSON("ajax/dismissNotification.ajax", { "formPassword" : getFormPassword(), "notification" : notification.attr("id") }, function(data, textStatus) {
+			/* dismiss in case of error, too. */
 			notification.slideUp();
+		}, function(xmlHttpRequest, textStatus, error) {
+			/* ignore error. */
 		});
 	});
 	return notification;
@@ -431,7 +503,7 @@ function ajaxifyNotification(notification) {
  */
 function getNotifications() {
 	$.getJSON("ajax/getNotifications.ajax", {}, function(data, textStatus) {
-		if (data.success) {
+		if ((data != null) && data.success) {
 			$.each(data.notifications, function(index, value) {
 				oldNotification = $("#sone #notification-area .notification#" + value.id);
 				notification = ajaxifyNotification(createNotification(value.id, value.text, value.dismissable)).hide();
@@ -446,8 +518,12 @@ function getNotifications() {
 			$.each(data.removedNotifications, function(index, value) {
 				$("#sone #notification-area .notification#" + value.id).slideUp();
 			});
+			setTimeout(getNotifications, 5000);
+		} else {
+			setTimeout(getNotifications, 30000);
 		}
-		setTimeout(getNotifications, 5000);
+	}, function(xmlHttpRequest, textStatus, error) {
+		/* ignore error. */
 	});
 }