X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fstatic%2Fjavascript%2Fsone.js;h=88fb3e3e1293d408e52f2a23dcf1cc075992c6aa;hb=e00973a8a0e75e3d96cf16377ab250902b99b45b;hp=6022655cea2a2ae7fb476818de55016665a7cbe7;hpb=c67605d6ee939160420d176cba9571f442c14978;p=Sone.git

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index 6022655..88fb3e3 100644
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -37,7 +37,8 @@ function registerInputTextareaSwap(inputElement, defaultText, inputFieldName, op
 		(function(inputField, textarea) {
 			inputField.focus(function() {
 				$(this).hide().attr("disabled", "disabled");
-				textarea.show().focus();
+				/* no, show(), “display: block” is not what I need. */
+				textarea.attr("style", "display: inline").focus();
 			});
 			if (inputField.val() == "") {
 				inputField.addClass("default");
@@ -49,6 +50,7 @@ function registerInputTextareaSwap(inputElement, defaultText, inputFieldName, op
 			$(inputField.get(0).form).submit(function() {
 				inputField.attr("disabled", "disabled");
 				if (!optional && (textarea.val() == "")) {
+					inputField.removeAttr("disabled").focus();
 					return false;
 				}
 			});
@@ -560,25 +562,6 @@ function postReply(sender, postId, text, callbackFunction) {
 }
 
 /**
- * Requests information about the reply with the given ID.
- *
- * @param replyId
- *            The ID of the reply
- * @param callbackFunction
- *            A callback function (parameters soneId, soneName, replyTime,
- *            replyDisplayTime, text, html)
- */
-function getReply(replyId, callbackFunction) {
-	$.getJSON("getReply.ajax", { "reply" : replyId }, function(data, textStatus) {
-		if ((data != null) && data.success) {
-			callbackFunction(data.soneId, data.soneName, data.time, data.displayTime, data.text, data.html);
-		}
-	}, function(xmlHttpRequest, textStatus, error) {
-		/* ignore error. */
-	});
-}
-
-/**
  * Ajaxifies the given Sone by enhancing all eligible elements with AJAX.
  *
  * @param soneElement
@@ -843,6 +826,22 @@ function getStatus() {
 			$.each(data.sones, function(index, value) {
 				updateSoneStatus(value.id, value.name, value.status, value.modified, value.locked, value.lastUpdatedUnknown ? null : value.lastUpdated);
 			});
+			/* search for removed notifications. */
+			$("#sone #notification-area .notification").each(function() {
+				notificationId = $(this).attr("id");
+				foundNotification = false;
+				$.each(data.notifications, function(index, value) {
+					if (value.id == notificationId) {
+						foundNotification = true;
+						return false;
+					}
+				});
+				if (!foundNotification) {
+					$(this).slideUp("normal", function() {
+						$(this).remove();
+					});
+				}
+			});
 			/* process notifications. */
 			$.each(data.notifications, function(index, value) {
 				oldNotification = $("#sone #notification-area .notification#" + value.id);
@@ -857,11 +856,8 @@ function getStatus() {
 				} else {
 					$("#sone #notification-area").append(notification);
 					notification.slideDown();
+					setActivity();
 				}
-				setActivity();
-			});
-			$.each(data.removedNotifications, function(index, value) {
-				$("#sone #notification-area .notification#" + value.id).slideUp();
 			});
 			/* process new posts. */
 			$.each(data.newPosts, function(index, value) {
@@ -1157,7 +1153,6 @@ function toggleIcon() {
 		iconBlinking = false;
 	} else {
 		iconActive = !iconActive;
-		console.log("showing icon: " + iconActive);
 		changeIcon(iconActive ? "images/icon-activity.png" : "images/icon.png");
 		setTimeout(toggleIcon, 1500);
 	}