From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 27 Feb 2011 08:46:36 +0000 (+0100)
Subject: Cleanup.
X-Git-Tag: xorg/1.1.0~130
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=c2c5ac82c928095074ebb8b23e21a72f6f87a44b;p=platal.git

Cleanup.

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

diff --git a/core b/core
index aa2ac75..ddfd5a0 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit aa2ac7586d7bb1e1479e65a0adef781395fdc57c
+Subproject commit ddfd5a088e3aa77b6e0194b1fcb530ef948cdd5b
diff --git a/htdocs/javascript/xorg.js b/htdocs/javascript/xorg.js
index 1a04b3f..a77981a 100644
--- a/htdocs/javascript/xorg.js
+++ b/htdocs/javascript/xorg.js
@@ -1008,26 +1008,21 @@ function sendTestEmail(token, hruid)
     }
 
     $.fn.extend({
-        quickSearch: function(args) {
+        quickSearch: function(options) {
             var previous = null;
-            var $this = this;
+            var $this  = this;
+            var $input = $this.get(0);
             var $popup;
-            var token;
-            var url      = 'search';
             var pending  = false;
             var disabled = false;
             var updatePopup;
-            var loadingClass = 'ac_loading_left';
-            if ($this.css('text-align') !== 'right') {
-                loadingClass = 'ac_loading';
-            }
-            args  = args || { };
-            token = args.token || $.xsrf_token;
-            if (token) {
-                url += '?token=' + token;
-            }
 
-            $popup = buildPopup(this, function() {
+            options = options || { };
+            options.queryParams = options.queryParams || { };
+            options.loadingClass = options.loadingClass ||
+                                   ($this.css('text-align') === 'right' ? 'ac_loading_left' : 'ac_loading');
+
+            $popup = buildPopup(this, options.selectAction || function() {
                 $(this).popWin(840, 600)
                     .click(function() {
                         $popup.hide();
@@ -1044,8 +1039,8 @@ function sendTestEmail(token, hruid)
                     return true;
                 }
                 updatePopup = markPending;
-                $this.addClass(loadingClass);
-                $.xapi(url, $.extend({ 'quick': quick }, args), function(data) {
+                $this.addClass(options.loadingClass);
+                $.xapi('search', $.extend({ 'quick': quick }, options.queryParams), function(data) {
                     if (data.profile_count > 10 || data.profile_count < 0) {
                         return $popup.hide();
                     }
@@ -1056,10 +1051,10 @@ function sendTestEmail(token, hruid)
                         disabled = true;
                     }
                 }).complete(function() {
-                    $this.removeClass(loadingClass);
+                    $this.removeClass(options.loadingClass);
                     updatePopup = doUpdatePopup;
                     if (pending) {
-                        updatePopup.call($this.get(0));
+                        updatePopup();
                     }
                 });
                 return true;
@@ -1067,9 +1062,8 @@ function sendTestEmail(token, hruid)
 
             function doUpdatePopup(dontDelay)
             {
-                var quick = $(this).val();
+                var quick = $this.val();
                 if ($.isFunction(quick.trim)) {
-                    console.log('it trims');
                     quick = quick.trim();
                 }
                 pending = false;
@@ -1079,13 +1073,13 @@ function sendTestEmail(token, hruid)
                 } else if (!dontDelay) {
                     var timeout = quick.length < 5 ? 300 : 100;
                     setTimeout(function() {
-                        updatePopup.call($this.get(0), true);
+                        updatePopup(true);
                     }, timeout);
                     return true;
                 } else if (previous === quick) {
                     return $popup.show();
                 }
-                return performUpdate.call(this, quick);
+                return performUpdate(quick);
             }
 
             updatePopup = doUpdatePopup;
@@ -1094,7 +1088,7 @@ function sendTestEmail(token, hruid)
                 if (e.keyCode !== 27 /* escape */ && e.keyCode !== 13 /* enter */
                     && e.keyCode !== 9 /* tab */ && e.keyCode !== 38 /* up */
                     && e.keyCode !== 40 /* down */) {
-                    return updatePopup.call(this);
+                    return updatePopup();
                 }
                 return true;
             })