X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=js%2Futil.js;h=0a03b86c23e2f8a53a264c4706e52dac4994baea;hb=d46c2cc8a70d83f7bf761ea8c778a8cd56d8e692;hp=601218844199ff6b6b682b963f8aa256770a3dd4;hpb=a627c699440c71af98d1150620a6cd4886633f3c;p=quix0rs-gnu-social.git

diff --git a/js/util.js b/js/util.js
index 6012188441..0a03b86c23 100644
--- a/js/util.js
+++ b/js/util.js
@@ -20,21 +20,21 @@ $(document).ready(function(){
 	// count character on keyup
 	function counter(event){
 		var maxLength = 140;
-		var currentLength = $("#status_textarea").val().length;
+		var currentLength = $("#notice_data-text").val().length;
 		var remaining = maxLength - currentLength;
-		var counter = $("#counter");
+		var counter = $("#notice_text-count");
 		counter.text(remaining);
 		
 		if (remaining <= 0) {
-			$("#status_form").addClass("response_error");
+			$("#form_notice").addClass("warning");
 		} else {
-			$("#status_form").removeClass("response_error");
+			$("#form_notice").removeClass("warning");
 		}
 	}
 
 	function submitonreturn(event) {
 		if (event.keyCode == 13) {
-			$("#status_form").submit();
+			$("#form_notice").submit();
 			event.preventDefault();
 			event.stopPropagation();
 			return false;
@@ -42,15 +42,15 @@ $(document).ready(function(){
 		return true;
 	}
 
-	if ($("#status_textarea").length) {
-		$("#status_textarea").bind("keyup", counter);
-		$("#status_textarea").bind("keydown", submitonreturn);
+	if ($("#notice_data-text").length) {
+		$("#notice_data-text").bind("keyup", counter);
+		$("#notice_data-text").bind("keydown", submitonreturn);
 		
 		// run once in case there's something in there
 		counter();
 		
 		// set the focus
-		$("#status_textarea").focus();
+		$("#notice_data-text").focus();
 	}
 
 	// XXX: refactor this code
@@ -81,29 +81,41 @@ $(document).ready(function(){
 		this.appendChild(ajax);
 	}
 
-	$("form.favor").ajaxForm(favoptions);
-	$("form.disfavor").ajaxForm(disoptions);
-	$("form.favor").each(addAjaxHidden);
-	$("form.disfavor").each(addAjaxHidden);
+	$("form.form_favor").ajaxForm(favoptions);
+	$("form.form_disfavor").ajaxForm(disoptions);
+	$("form.form_favor").each(addAjaxHidden);
+	$("form.form_disfavor").each(addAjaxHidden);
 
 	$("#nudge").ajaxForm ({ dataType: 'xml',
-							success: function(xml) { $("#nudge").replaceWith(document._importNode($("#nudge_response", xml).get(0),true)); }
+							beforeSubmit: function(xml) { $("form#nudge input[type=submit]").attr("disabled", "disabled");
+														  $("form#nudge input[type=submit]").addClass("disabled");
+														},
+							success: function(xml) { $("#nudge").replaceWith(document._importNode($("#nudge_response", xml).get(0),true)); 
+												     $("#nudge input[type=submit]").removeAttr("disabled");
+												     $("#nudge input[type=submit]").removeClass("disabled");
+												   }
 						 });
 	$("#nudge").each(addAjaxHidden);
-	$("#nudge .submit").bind('click', function(e) {	$(this).addClass("processing"); });
-
 
 	var Subscribe = { dataType: 'xml',
+					  beforeSubmit: function(formData, jqForm, options) { $("form.subscribe input[type=submit]").attr("disabled", "disabled");
+																	      $("form.subscribe input[type=submit]").addClass("disabled");
+																	    },
 					  success: function(xml) { var form_unsubscribe = document._importNode($('form', xml).get(0), true);
 										  	   var form_unsubscribe_id = form_unsubscribe.id;
 											   var form_subscribe_id = form_unsubscribe_id.replace('unsubscribe', 'subscribe');
 											   $("form#"+form_subscribe_id).replaceWith(form_unsubscribe);
 											   $("form#"+form_unsubscribe_id).ajaxForm(UnSubscribe).each(addAjaxHidden);
 											   $("dd.subscribers").text(parseInt($("dd.subscribers").text())+1);
+											   $("form.subscribe input[type=submit]").removeAttr("disabled");
+											   $("form.subscribe input[type=submit]").removeClass("disabled");
 										     }
 					};
 
 	var UnSubscribe = { dataType: 'xml',
+						beforeSubmit: function(formData, jqForm, options) { $("form.unsubscribe input[type=submit]").attr("disabled", "disabled");
+																		    $("form.unsubscribe input[type=submit]").addClass("disabled");
+																		  },
 					    success: function(xml) { var form_subscribe = document._importNode($('form', xml).get(0), true);
 										  		 var form_subscribe_id = form_subscribe.id;
 												 var form_unsubscribe_id = form_subscribe_id.replace('subscribe', 'unsubscribe');
@@ -112,6 +124,8 @@ $(document).ready(function(){
 												 $("#profile_send_a_new_message").remove();
 												 $("#profile_nudge").remove();
 											     $("dd.subscribers").text(parseInt($("dd.subscribers").text())-1);
+												 $("form.unsubscribe input[type=submit]").removeAttr("disabled");
+												 $("form.unsubscribe input[type=submit]").removeClass("disabled");
 											   }
 					  };
 
@@ -122,38 +136,51 @@ $(document).ready(function(){
 
 
 	var PostNotice = { dataType: 'xml',
-					   beforeSubmit: function(formData, jqForm, options) { if ($("#status_textarea").get(0).value.length == 0) {
-																				$("#status_form").addClass("response_error");
+					   beforeSubmit: function(formData, jqForm, options) { if ($("#notice_data-text").get(0).value.length == 0) {
+																				$("#form_notice").addClass("warning");
 																				return false;
 																		   }
+																		   $("#notice_action-submit").attr("disabled", "disabled");
+																		   $("#notice_action-submit").addClass("disabled");
 																		   return true;
 												 						 },
-					   success: function(xml) {	if ($(".error", xml).length > 0) {
-													var response_error = document._importNode($(".error", xml).get(0), true);
-													response_error = response_error.textContent || response_error.innerHTML;
-													alert(response_error);
+					   success: function(xml) {	if ($("#error", xml).length > 0 || $("#command_result", xml).length > 0) {
+													var result = document._importNode($("p", xml).get(0), true);
+													result = result.textContent || result.innerHTML;
+													alert(result);
 												}
 												else {
-													$("#notices").prepend(document._importNode($("li", xml).get(0), true));
-													$("#status_textarea").val("");
+													$("#notices_primary .notices").prepend(document._importNode($("li", xml).get(0), true));
+													$("#notice_data-text").val("");
 													counter();
-													$(".notice_single:first").css({display:"none"});
-													$(".notice_single:first").fadeIn(2500);
+													$("#notices_primary .notice:first").css({display:"none"});
+													$("#notices_primary .notice:first").fadeIn(2500);
 												}
+												$("#notice_action-submit").removeAttr("disabled");
+												$("#notice_action-submit").removeClass("disabled");
 											 }
-					   }
-	$("#status_form").ajaxForm(PostNotice);
-	$("#status_form").each(addAjaxHidden);
+					   };
+	$("#form_notice").ajaxForm(PostNotice);
+	$("#form_notice").each(addAjaxHidden);
+
+    $(".notice").hover(
+        function () {
+            $(this).addClass('hover');
+        }, 
+        function () {
+            $(this).removeClass('hover');
+        }
+    );
 });
 
 function doreply(nick,id) {
 	rgx_username = /^[0-9a-zA-Z\-_.]*$/;
 	if (nick.match(rgx_username)) {
 		replyto = "@" + nick + " ";
-		if ($("#status_textarea").length) {
-			$("#status_textarea").val(replyto);
-			$("form#status_form input#inreplyto").val(id);
-			$("#status_textarea").focus();
+		if ($("#notice_data-text").length) {
+			$("#notice_data-text").val(replyto);
+			$("#form_notice input#notice_in-reply-to").val(id);
+			$("#notice_data-text").focus();
 			return false;
 		}
 	}