Don't send empty messages

[reliable-chat] / webclient / rc.html

diff --git a/webclient/rc.html b/webclient/rc.html
index d06f515e4328a307b910747c863bf196710e063e..7f3e8d1bfaaca05d536bbe3a1cfc9b0004b5bf11 100644 (file)
--- a/webclient/rc.html
+++ b/webclient/rc.html
@@ -443,7 +443,7 @@
 
        function rcinput(input) {
                var message;
 
        function rcinput(input) {
                var message;

-               var re = /^\/(\S+)(\s(.*))?/
+               var re = /^\/(\S+)(\s(.*))?/;

                var match = re.exec(input);
                if (match) {
                        var command = match[1];
                var match = re.exec(input);
                if (match) {
                        var command = match[1];


@@ -451,6 +451,10 @@
                        if (command == 'me') {
                                message = "* " + rcnick() + "  " + rest;
                        } else if (command == 'nick') {
                        if (command == 'me') {
                                message = "* " + rcnick() + "  " + rest;
                        } else if (command == 'nick') {

+                               if (rcnick() == rest) {
+                                       rcaddmessagetoUI({'Text': '-!- Your nick is already ' + rcnick(), 'ServerTimes': {}});
+                                       return;
+                               }

                                message = "*** " + rcnick() + " is now known as " + rest;
                                rcsetnick(rest);
                        } else {
                                message = "*** " + rcnick() + " is now known as " + rest;
                                rcsetnick(rest);
                        } else {


@@ -468,7 +472,9 @@
 
        function rckeydown(event) {
                if (event.keyCode == 13) {
 
        function rckeydown(event) {
                if (event.keyCode == 13) {

-                       rcinput(document.input.say.value);
+                       if (document.input.say.value) {
+                               rcinput(document.input.say.value);
+                       }

                        document.input.say.value = "";
                        return false;
                }
                        document.input.say.value = "";
                        return false;
                }