From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sat, 26 Feb 2011 11:14:09 +0000 (+0100)
Subject: Don't disable search on abort.
X-Git-Tag: xorg/1.1.0~132
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=c54829c19716897a4ad1eb2f13b2f66e896fdcae;p=platal.git

Don't disable search on abort.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

diff --git a/htdocs/javascript/xorg.js b/htdocs/javascript/xorg.js
index e9bc0af..dfda329 100644
--- a/htdocs/javascript/xorg.js
+++ b/htdocs/javascript/xorg.js
@@ -1013,11 +1013,13 @@ function sendTestEmail(token, hruid)
             var previous = null;
             var $this = this;
             var $popup;
-            var token = (args && args.token) || $.xsrf_token;
+            var token;
             var url   = 'search';
             var pending = false;
             var disabled = false;
             var updatePopup;
+            args  = args || { };
+            token = args.token || $.xsrf_token;
             if (token) {
                 url += '?token=' + token;
             }
@@ -1056,7 +1058,11 @@ function sendTestEmail(token, hruid)
                     }
                     $popup.updateContent(data.profiles);
                     previous = quick;
-                }, function() { disabled = true; });
+                }, function(data, text) {
+                    if (text !== 'abort') {
+                        disabled = true;
+                    }
+                });
                 updatePopup = markPending;
                 setTimeout(function() {
                     updatePopup = doUpdatePopup;