/me support

 * Support for the /me command
 * Fix escaping
 * New strophe.js version

diff --git a/js/main.js b/js/main.js
index c64776da37ac3b9bcffbce38cf17703797323adb..6072c6704f404a13ae48428c9fb0aefe1e5a5e6c 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -72,16 +72,23 @@ function addBubble(nick) {
 
 function handleMessage(msg) {
        var html = '';
-       var sender = Strophe.getResourceFromJid(msg.getAttribute('from'));
+       var sender = Strophe.xmlescape(Strophe.getResourceFromJid(msg.getAttribute('from')));
        var type = msg.getAttribute('type');
-       var body = Strophe.getText(msg.getElementsByTagName('body')[0]);
+       var body = Strophe.xmlescape(Strophe.getText(msg.getElementsByTagName('body')[0]));
 
        html += '<div class="msg">';
        if (sender) {
-               html += '<span class="sender">';
-               html += sender;
-               html += ':</span> ';
-               html += body + '</div>';
+               if (body.search(/^\/me/) == 0) {
+                       body = body.replace(/^\/me/, sender);
+                       html += '<span class="sender">';
+                       html += body;
+                       html += '</span></div>';
+               } else {
+                       html += '<span class="sender">';
+                       html += sender;
+                       html += ':</span> ';
+                       html += body + '</div>';
+               }
        } else {
                html += '<span class="server">';
                html += body + '</span></div>';

diff --git a/js/strophejs b/js/strophejs
index f31e73fd12ca779b6cd93043496eda001e3b1aee..77fd14321c069bf88d0bf6041af8951c22420cb3 160000 (submodule)
--- a/js/strophejs
+++ b/js/strophejs
@@ -1 +1 @@
-Subproject commit f31e73fd12ca779b6cd93043496eda001e3b1aee
+Subproject commit 77fd14321c069bf88d0bf6041af8951c22420cb3