Merge branch 'xorg/master' into xorg/f/geocoding
[platal.git] / htdocs / javascript / xorg.js
index a77981a..47bf78b 100644 (file)
@@ -132,16 +132,17 @@ function addSearchEngine()
             var s_img;
             var s_title;
             var s_url;
+            var href = this.attr('href');
 
             for (site in goodies[type].sites) {
                 entry = goodies[type].sites[site];
                 s_alt   = entry.alt || "";
                 s_img   = entry.img;
                 s_title = entry.title || "";
-                s_url   = entry.url_prefix.length > 0 ? entry.url_prefix + escape(this.href) : this.href;
+                s_url   = entry.url_prefix.length > 0 ? entry.url_prefix + escape(href) : href;
 
                 text += '<a href="' + s_url + '"><img src="' + s_img + '" title="' + s_title + '" alt="' + s_alt + '"></a><br />';
-                }
+            }
             text += '<a href="https://www.polytechnique.org/Xorg/Goodies">Plus de bonus</a> ...</div>';
 
             return this.overlib({
@@ -178,7 +179,7 @@ function auto_links() {
         }
         if ((!href.contains(fqdn) && !this.className.contains('popup')) || node.hasClass('popup')) {
             node.click(function () {
-                window.open(href);
+                window.open(this.href);
                 return false;
             });
         }
@@ -565,7 +566,7 @@ function checkPassword(box, okLabel) {
     }
 }
 
-function hashResponse(password1, password2, hasConfirmation) {
+function hashResponse(password1, password2, hasConfirmation, doAuth) {
     var pw1 = $('[name=' + password1 + ']').val();
     var pw2;
 
@@ -589,9 +590,15 @@ function hashResponse(password1, password2, hasConfirmation) {
         return false;
     }
 
-    alert("Le mot de passe que tu as rentré va être chiffré avant de nous parvenir par Internet ! Ainsi il ne circulera pas en clair.");
+    alert("Le mot de passe va être chiffré avant de nous parvenir par Internet ! Ainsi il ne circulera pas en clair.");
     $('[name=' + password1 + ']').val('');
     $('[name=pwhash]').val(hash_encrypt(pw1));
+
+    if (doAuth) {
+        $('[name=password]').val(pw1);
+        doChallengeResponse();
+    }
+
     return true;
 }
 
@@ -684,7 +691,7 @@ function sendTestEmail(token, hruid)
     } else {
         msg += " sur ton addresse.";
     }
-    $('#mail_sent').successMessage($url + '?token=' + token, msg);
+    $('#mail_sent').successMessage(url + '?token=' + token, msg);
     return false;
 }
 
@@ -871,7 +878,7 @@ function sendTestEmail(token, hruid)
                 '<div class="identity">' +
                     '<div class="photo"><img src="photo/${hrpid}" alt="${directory_name}" /></div>' +
                     '<div class="nom">' +
-                        '{{if is_female}}&bull;{{/if}}<a href="profile/${hrpid}">${directory_name}</a>' +
+                        '{{if is_female}}&bull;{{/if}}<a>${directory_name}</a>' +
                     '</div>' +
                     '<div class="edu">${promo}</div>' +
                 '</div>' +
@@ -880,20 +887,11 @@ function sendTestEmail(token, hruid)
             '</div>');
 
 
-    function buildPopup(input, linkBindFunction)
+    function buildPopup(input, destination, linkBindFunction)
     {
-        var pos    = findPos(input.get(0));
-        var $popup = $('<div>').hide()
-            .addClass('contact-list')
-            .css({
-                position: 'absolute',
-                width: '300px',
-                top: input.css('bottom'),
-                left: pos.x - 300 + input.width(),
-                clear: 'both',
-                'text-align': 'left'
-            });
+        var $popup = destination;
         var selected = null;
+        var hovered  = 0;
 
         function updateSelection()
         {
@@ -911,27 +909,44 @@ function sendTestEmail(token, hruid)
 
         function formatProfile(i, profile) {
             var data = $.tmpl('quickMinifiche', profile)
+                .css('cursor', 'pointer')
                 .hover(function() {
                     selected = i;
                     updateSelection();
+                    hovered++;
                 }, function() {
                     if (selected === i) {
                         selected = null;
                         updateSelection();
                     }
+                    hovered--;
                 }).mouseup(function() {
-                    if (!($(this).find('a').is(':hover'))) {
-                        $(this).find('a').click();
+                    var sel = $(this).find('a');
+                    if (!sel.attr('hovered')) {
+                        sel.click();
                     }
                 });
+            data.find('a').hover(function() { $(this).attr('hovered', true) },
+                                 function() { $(this).attr('hovered', false) });
             return data;
         }
 
-        input.after($popup);
+        if (!$popup) {
+            $popup = $('<div>').hide()
+            .addClass('contact-list')
+            .css({
+                position: 'absolute',
+                width: '300px',
+                top: input.css('bottom'),
+                clear: 'both',
+                'text-align': 'left'
+            });
+            input.after($popup);
+        }
 
         return {
             hide: function(ignoreIfHover) {
-                if (ignoreIfHover && $popup.is(':hover')) {
+                if (ignoreIfHover && hovered !== 0) {
                     return true;
                 }
                 selected = null;
@@ -941,7 +956,8 @@ function sendTestEmail(token, hruid)
             },
 
             show: function() {
-                $popup.show();
+                var pos = findPos(input.get(0));
+                $popup.css('left', pos.x - 300 + input.width()).show();
                 return true;
             },
 
@@ -983,13 +999,18 @@ function sendTestEmail(token, hruid)
                 return true;
             },
 
-            updateContent: function(profiles) {
+            updateContent: function(profiles, extra) {
                 var profile;
+                var $this;
                 $popup.empty();
                 for (var i = 0, len = profiles.length; i < len; i++) {
-                    profile = formatProfile(i, profiles[i]);
-                    profile.find('a').each(linkBindFunction);
-                    profile.appendTo($popup);
+                    (function(elt) {
+                        var profile = formatProfile(i, elt);
+                        profile.find('a').each(function() {
+                            linkBindFunction.call(this, elt, $this, extra);
+                        });
+                        profile.appendTo($popup);
+                    }(profiles[i]));
                 }
                 if (len === 1) {
                     selected = 0;
@@ -1009,25 +1030,48 @@ function sendTestEmail(token, hruid)
 
     $.fn.extend({
         quickSearch: function(options) {
-            var previous = null;
-            var $this  = this;
-            var $input = $this.get(0);
+            return this.each(function() {
+            var $this  = $(this);
+            var $input = this;
             var $popup;
+            var previous = null;
             var pending  = false;
             var disabled = false;
             var updatePopup;
 
             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();
-                    });
-            });
+            options = $.extend({
+                destination:       null,
+                minChars:          3,
+                shortChars:        5,
+                shortTimeout:      300,
+                longTimeout:       100,
+                queryParams:       {
+                    offset: 0,
+                    count:  10,
+                    allow_special: true
+                },
+                loadingClassLeft:  'ac_loading',
+                loadingClassRight: 'ac_loading_left',
+                selectAction: function(profile, popup, extra) {
+                    var type = extra.link_type || 'profile';
+                    switch (type) {
+                      case 'profile':
+                        $(this).attr('href', 'profile/' + profile.hrpid)
+                        .popWin(840, 600)
+                        .click(function() { $popup.hide(); return false; });
+                        break;
+                      case 'admin':
+                        $(this).attr('href', 'admin/user/' + profile.hrpid)
+                        .click(function() { window.open($(this).attr('href')); return false });
+                        break;
+                    }
+                }
+            }, options);
+            options.loadingClass = $this.css('text-align') === 'right' ? options.loadingClassRight
+                                                                       : options.loadingClassLeft;
+            $this.attr('autocomplete', 'off');
+            $popup = buildPopup($this, options.destination, options.selectAction);
 
             function markPending() {
                 pending = true;
@@ -1041,10 +1085,10 @@ function sendTestEmail(token, hruid)
                 updatePopup = markPending;
                 $this.addClass(options.loadingClass);
                 $.xapi('search', $.extend({ 'quick': quick }, options.queryParams), function(data) {
-                    if (data.profile_count > 10 || data.profile_count < 0) {
+                    if (data.profile_count > options.queryParams.count || data.profile_count < 0) {
                         return $popup.hide();
                     }
-                    $popup.updateContent(data.profiles);
+                    $popup.updateContent(data.profiles, data);
                     previous = quick;
                 }, function(data, text) {
                     if (text !== 'abort') {
@@ -1067,11 +1111,11 @@ function sendTestEmail(token, hruid)
                     quick = quick.trim();
                 }
                 pending = false;
-                if (disabled || quick.length < 3) {
+                if (disabled || quick.length < options.minChars) {
                     previous = quick;
                     return $popup.hide();
                 } else if (!dontDelay) {
-                    var timeout = quick.length < 5 ? 300 : 100;
+                    var timeout = quick.length < options.shortChars ? options.shortTimeout : options.longTimeout;
                     setTimeout(function() {
                         updatePopup(true);
                     }, timeout);
@@ -1084,7 +1128,7 @@ function sendTestEmail(token, hruid)
 
             updatePopup = doUpdatePopup;
 
-            return this.keyup(function(e) {
+            return $this.keyup(function(e) {
                 if (e.keyCode !== 27 /* escape */ && e.keyCode !== 13 /* enter */
                     && e.keyCode !== 9 /* tab */ && e.keyCode !== 38 /* up */
                     && e.keyCode !== 40 /* down */) {
@@ -1119,7 +1163,7 @@ function sendTestEmail(token, hruid)
             .blur(function() {
                 return $popup.hide(true);
             })
-            .focus(updatePopup);
+            .focus(updatePopup);});
         }
     });
 }(jQuery));
@@ -1137,10 +1181,10 @@ function sendTestEmail(token, hruid)
             if (typeof text === 'string') {
                 args.push(text);
                 if (width) {
-                    args.push(width);
+                    args.push(WIDTH, width);
                 }
                 if (height) {
-                    args.push(height);
+                    args.push(HEIGHT, height);
                 }
             } else {
                 for (key in text) {