]> git.scottworley.com Git - reliable-chat/commitdiff
Merge skitch's changes.
authorScott Worley <sworley@chkno.net>
Fri, 3 Aug 2012 01:38:31 +0000 (18:38 -0700)
committerScott Worley <sworley@chkno.net>
Fri, 3 Aug 2012 01:38:31 +0000 (18:38 -0700)
Conflicts:
webclient/rc.html

1  2 
webclient/rc.html

index 8aeae37ce3d43d4de54b0cfcb65bca39488afc50,9460159064b4e56ed21c131b2b2e5b42a2d33316..b3109a92ee387b858891d72a9f2fdf10f0641d0b
                                message = "<" + rcnick() + "> " + input;
                        }
  
+                       // /me support
+                       var message;
+                       var re = /^\/me (.*)/;
+                       var match = re.exec(input);
+                       var inputme = input.substring(4);
+                       if (match) {
+                               message = "* " + rcnick() + "  " + inputme;
+                       } else {
+                               message = "<" + rcnick() + "> " + input;
+                       }
 +                      // Say the message
 +                      var d = rcaddmessagetohistory(message);
 +                      rcsend(d, message);
 +
                        // Remind people to set their nick
                        if (rcnick() == 'anonymous') {
                                rcaddmessagetohistory("-!- Set your nick with /nick");