X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=7d7bcb557b0c07dd49a965a59f17f5933ea851fa;hb=2dab45dd964a48144d8c919b491f792b53f5a2ea;hp=956b3dfd9ce30b8057ab72eb724620653dbf007b;hpb=3785277a0b89b63a40b7423d80ba779c84ac630e;p=Sone.git

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index 956b3df..7d7bcb5 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -63,12 +63,13 @@ function registerInputTextareaSwap(inputElement, defaultText, inputFieldName, op
  * @param element
  *            The element to add a “comment” link to
  */
-function addCommentLink(postId, element) {
+function addCommentLink(postId, element, insertAfterThisElement) {
 	if ($(element).find(".show-reply-form").length > 0) {
 		return;
 	}
 	commentElement = (function(postId) {
 		var commentElement = $("<div><span>Comment</span></div>").addClass("show-reply-form").click(function() {
+			markPostAsKnown(getPostElement(this));
 			replyElement = $("#sone .post#" + postId + " .create-reply");
 			replyElement.removeClass("hidden");
 			replyElement.removeClass("light");
@@ -85,9 +86,7 @@ function addCommentLink(postId, element) {
 		});
 		return commentElement;
 	})(postId);
-	$(element).find(".status-line .time").each(function() {
-		$(this).after(commentElement.clone(true));
-	});
+	$(insertAfterThisElement).after(commentElement.clone(true));
 }
 
 var translations = {};
@@ -299,7 +298,7 @@ function getPostId(element) {
 }
 
 function getPostTime(element) {
-	return getPostElement(element).find(".storage-time").text();
+	return getPostElement(element).find(".post-time").text();
 }
 
 function getReplyElement(element) {
@@ -311,7 +310,7 @@ function getReplyId(element) {
 }
 
 function getReplyTime(element) {
-	return getReplyElement(element).find(".storage-time").text();
+	return getReplyElement(element).find(".reply-time").text();
 }
 
 function likePost(postId) {
@@ -454,8 +453,7 @@ function ajaxifyPost(postElement) {
 		postReply(postId, text, function(success, error, replyId) {
 			if (success) {
 				loadNewReply(replyId);
-				markPostAsKnown(postElement);
-				markReplyAsKnown($(postElement).find(".reply"));
+				markPostAsKnown(getPostElement(inputField));
 				$("#sone .post#" + postId + " .create-reply").addClass("hidden");
 			} else {
 				alert(error);
@@ -475,13 +473,18 @@ function ajaxifyPost(postElement) {
 	/* convert all “like” buttons to javascript functions. */
 	$(postElement).find(".like-post").submit(function() {
 		likePost(getPostId(this));
+		markPostAsKnown(getPostElement(this));
 		return false;
 	});
 	$(postElement).find(".unlike-post").submit(function() {
 		unlikePost(getPostId(this));
+		markPostAsKnown(getPostElement(this));
 		return false;
 	});
 
+	/* add “comment” link. */
+	addCommentLink(getPostId(postElement), postElement, $(postElement).find(".post-status-line .time"));
+
 	/* process all replies. */
 	$(postElement).find(".reply").each(function() {
 		ajaxifyReply(this);
@@ -491,12 +494,13 @@ function ajaxifyPost(postElement) {
 	getTranslation("WebInterface.DefaultText.Reply", function(text) {
 		$(postElement).find("input.reply-input").each(function() {
 			registerInputTextareaSwap(this, text, "text", false, false);
-			addCommentLink(getPostId(postElement), postElement);
 		});
 	});
 
-	/* add “comment” link. */
-	addCommentLink(getPostId(postElement), postElement);
+	/* mark everything as known on click. */
+	$(postElement).click(function() {
+		markPostAsKnown(this);
+	});
 
 	/* hide reply input field. */
 	$(postElement).find(".create-reply").addClass("hidden");
@@ -511,10 +515,12 @@ function ajaxifyPost(postElement) {
 function ajaxifyReply(replyElement) {
 	$(replyElement).find(".like-reply").submit(function() {
 		likeReply(getReplyId(this));
+		markPostAsKnown(getPostElement(this));
 		return false;
 	});
 	$(replyElement).find(".unlike-reply").submit(function() {
 		unlikeReply(getReplyId(this));
+		markPostAsKnown(getPostElement(this));
 		return false;
 	});
 	(function(replyElement) {
@@ -524,7 +530,12 @@ function ajaxifyReply(replyElement) {
 			});
 		});
 	})(replyElement);
-	addCommentLink(getPostId(replyElement), replyElement);
+	addCommentLink(getPostId(replyElement), replyElement, $(replyElement).find(".reply-status-line .time"));
+
+	/* mark post and all replies as known on click. */
+	$(replyElement).click(function() {
+		markPostAsKnown(getPostElement(replyElement));
+	});
 }
 
 /**
@@ -565,6 +576,7 @@ function getStatus() {
 					$("#sone #notification-area").append(notification);
 					notification.slideDown();
 				}
+				setActivity();
 			});
 			$.each(data.removedNotifications, function(index, value) {
 				$("#sone #notification-area .notification#" + value.id).slideUp();
@@ -599,6 +611,10 @@ function loadNewPost(postId) {
 	loadedPosts[postId] = true;
 	$.getJSON("ajax/getPost.ajax", { "post" : postId }, function(data, textStatus) {
 		if ((data != null) && data.success) {
+			/* maybe weird timing stuff ensues. */
+			if (data.post.id in loadedPosts) {
+				return;
+			}
 			var firstOlderPost = null;
 			$("#sone .post").each(function() {
 				if (getPostTime(this) < data.post.time) {
@@ -606,7 +622,6 @@ function loadNewPost(postId) {
 					return false;
 				}
 			});
-			newPost = $(data.post.html).addClass("hidden");
 			if (firstOlderPost != null) {
 				newPost.insertBefore(firstOlderPost);
 			} else {
@@ -614,6 +629,7 @@ function loadNewPost(postId) {
 			}
 			ajaxifyPost(newPost);
 			newPost.slideDown();
+			setActivity();
 		}
 	});
 }
@@ -626,6 +642,10 @@ function loadNewReply(replyId) {
 	$.getJSON("ajax/getReply.ajax", { "reply": replyId }, function(data, textStatus) {
 		/* find post. */
 		if ((data != null) && data.success) {
+			/* maybe weird timing stuff ensues. */
+			if (data.reply.id in loadedReplies) {
+				return;
+			}
 			$("#sone .post#" + data.reply.postId).each(function() {
 				var firstNewerReply = null;
 				$(this).find(".replies .reply").each(function() {
@@ -634,7 +654,6 @@ function loadNewReply(replyId) {
 						return false;
 					}
 				});
-				newReply = $(data.reply.html).addClass("hidden");
 				if (firstNewerReply != null) {
 					newReply.insertBefore(firstNewerReply);
 				} else {
@@ -646,6 +665,7 @@ function loadNewReply(replyId) {
 				}
 				ajaxifyReply(newReply);
 				newReply.slideDown();
+				setActivity();
 			});
 		}
 	});
@@ -654,21 +674,46 @@ function loadNewReply(replyId) {
 function markPostAsKnown(postElements) {
 	$(postElements).each(function() {
 		postElement = this;
-		$.getJSON("ajax/markPostAsKnown.ajax", {"formPassword": getFormPassword(), "post": getPostId(postElement)}, function() {
-			$(postElement).removeClass("new");
-		});
+		if ($(postElement).hasClass("new")) {
+			(function(postElement) {
+				$.getJSON("ajax/markPostAsKnown.ajax", {"formPassword": getFormPassword(), "post": getPostId(postElement)}, function(data, textStatus) {
+					$(postElement).removeClass("new");
+				});
+			})(postElement);
+		}
 	});
+	markReplyAsKnown($(postElements).find(".reply"));
 }
 
 function markReplyAsKnown(replyElements) {
 	$(replyElements).each(function() {
 		replyElement = this;
-		$.getJSON("ajax/markReplyAsKnown.ajax", {"formPassword": getFormPassword(), "reply": getReplyId(replyElement)}, function() {
-			$(replyElement).removeClass("new");
-		});
+		if ($(replyElement).hasClass("new")) {
+			(function(replyElement) {
+				$.getJSON("ajax/markReplyAsKnown.ajax", {"formPassword": getFormPassword(), "reply": getReplyId(replyElement)}, function(data, textStatus) {
+					$(replyElement).removeClass("new");
+				});
+			})(replyElement);
+		}
 	});
 }
 
+function resetActivity() {
+	title = document.title;
+	if (title.indexOf('(') == 0) {
+		document.title = title.substr(title.indexOf(' ') + 1);
+	}
+}
+
+function setActivity() {
+	if (!focus) {
+		title = document.title;
+		if (title.indexOf('(') != 0) {
+			document.title = "(!) " + title;
+		}
+	}
+}
+
 /**
  * Creates a new notification.
  *
@@ -695,6 +740,8 @@ function createNotification(id, text, dismissable) {
 // EVERYTHING BELOW HERE IS EXECUTED AFTER LOADING THE PAGE
 //
 
+var focus = true;
+
 $(document).ready(function() {
 
 	/* this initializes the status update input field. */
@@ -794,4 +841,13 @@ $(document).ready(function() {
 
 	/* activate status polling. */
 	setTimeout(getStatus, 5000);
+
+	/* reset activity counter when the page has focus. */
+	$(window).focus(function() {
+		focus = true;
+		resetActivity();
+	}).blur(function() {
+		focus = false;
+	})
+
 });