Merge branch 'master' of /pichat/repo

2 files changed, 21 insertions, 18 deletions

diff --git a/static/js/admin.js b/static/js/admin.js
index a5a5f71..e6bef70 100644
--- a/static/js/admin.js
+++ b/static/js/admin.js
@@ -26,7 +26,7 @@ Admin.mute = function(nick) {
         .append(reason)
         .appendTo($(Admin._dialogHtml));
     var title = 'Mute ' + nick;
-    var cancel = function() { html.dialog('close'); }
+    var close = function() { html.dialog('close'); }
     var submit = function() {
         html.find('[name]').removeClass('ui-state-error');
 
@@ -34,26 +34,29 @@ Admin.mute = function(nick) {
         var u = unit.val();
         var r = reason.val();
 
-        if (!t) {
-            time.addClass('ui-state-error');
-        }
+        if (!t) { time.addClass('ui-state-error'); }
+        if (!u) { reason.addClass('ui-state-error'); }
+        if (!r) { reason.addClass('ui-state-error'); }
+        if (!t || !u || !r) { return; }
 
-        if (!u) {
-            reason.addClass('ui-state-error');
-        }
-
-        if (!r) {
-            reason.addClass('ui-state-error');
-        }
-
-        if (!t || !u || !r) {
-            return;
-        }
+        $.ajax({
+            type: 'POST',
+            timeout: 5000,
+            url: '/mute',
+            cache: false,
+            data: { 'time': t, 'unit': u,
+                    'reason': r, 'nick': nick },
+            success: close,
+            error: function(s) {
+                alert("Error muting user: " + s.responseText);
+            }
+        });
     };
     html.dialog({
-        modal: true,
+        modal: false,
         title: title,
         width: 400,
-        buttons: { 'OK': submit , 'Cancel': cancel }
+        buttons: { 'OK': submit , 'Cancel': close }
     });
+    html.dialog('open');
 };
\ No newline at end of file
diff --git a/static/js/pichat.js b/static/js/pichat.js
index d6af36f..d52212d 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -221,7 +221,7 @@ function handleMsgError(resp) {
     if (respText  == 'MUST_LOGIN') {
         alert("Can't send message! Please login.");
     } else if (respText) {
-        alert("Can't send message! (" + respText + ")");
+        alert("Can't send message! " + respText);
     } else {
         alert("Can't send message!");
     }