Merge branch '3.2RC'3.2

1 files changed, 26 insertions, 12 deletions

diff --git a/view/js/mod_new_channel.js b/view/js/mod_new_channel.js
index e670e1a35..e78de2596 100644
--- a/view/js/mod_new_channel.js
+++ b/view/js/mod_new_channel.js
@@ -1,5 +1,7 @@
 	$(document).ready(function() {
-//		$("#id_permissions_role").sSelect();
+
+		$("#newchannel-submit-button").attr('disabled','disabled');
+
 		$("#id_name").blur(function() {
 			$("#name-spinner").show();
 			var zreg_name = $("#id_name").val();
@@ -9,21 +11,33 @@
 					$("#help_name").html("");
 					zFormError("#help_name",data.error);
 				}
+				else {
+					$("#newchannel-submit-button").removeAttr('disabled');
+				}
 				$("#name-spinner").hide();
 			});
 		});
 
-		$("#id_nickname").blur(function() {
-			$("#nick-spinner").show();
-			var zreg_nick = $("#id_nickname").val();
-			$.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) {
-				$("#id_nickname").val(data);
-				if(data.error) {
-					$("#help_nickname").html("");
-					zFormError("#help_nickname",data.error);
-				}
-				$("#nick-spinner").hide();
-			});
+		$("#id_nickname").click(function() {
+			$("#newchannel-submit-button").attr('disabled','disabled');
 		});
 
 	});
+
+
+	function validate_channel() {
+		$("#nick-spinner").show();
+		var zreg_nick = $("#id_nickname").val();
+		$.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) {
+			$("#id_nickname").val(data);
+			if(data.error) {
+				$("#help_nickname").html("");
+				zFormError("#help_nickname",data.error);
+			}
+			else {
+				$("#newchannel-submit-button").removeAttr('disabled');
+			}
+			$("#nick-spinner").hide();
+		});
+
+	}