Skip to content
Extraits de code Groupes Projets
Valider 14888bf2 rédigé par mattab's avatar mattab
Parcourir les fichiers

Merge remote-tracking branch 'origin/master'

parents 1dbdd3db ae43ce59
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -74,7 +74,6 @@ $(function () {
appendTo: $('.custom_select_container', selector),
select: function (event, ui) {
event.preventDefault();
if (ui.item.id > 0) {
// set attributes of selected site display (what shows in the box)
$('.custom_select_main_link', selector)
......@@ -102,7 +101,29 @@ $(function () {
$('.custom_select_main_link', selector).addClass('custom_select_loading');
},
open: function (event, ui) {
var widthSitesSelection = +$('.custom_select_ul_list', selector).width();
$('.custom_select_main_link', selector).removeClass('custom_select_loading');
var maxSitenameWidth = $('.max_sitename_width', selector);
if (widthSitesSelection > maxSitenameWidth.val()) {
maxSitenameWidth.val(widthSitesSelection);
}
else {
maxSitenameWidth = +maxSitenameWidth.val(); // convert to int
}
$('.custom_select_ul_list', selector).hide();
// customize jquery-ui's autocomplete positioning
var cssToRemove = {float: 'none', position: 'static'};
$('.siteSelect.ui-autocomplete', selector)
.show().width(widthSitesSelection).css(cssToRemove)
.find('li,a').each(function () {
$(this).css(cssToRemove);
});
$('.custom_select_block_show', selector).width(widthSitesSelection);
}
}).data("ui-autocomplete")._renderItem = function (ul, item) {
$(ul).addClass('siteSelect');
......@@ -158,12 +179,12 @@ $(function () {
$(this).click(function (e) {
var idsite = $(this).attr('data-siteid'),
name = $(this).text(),
mainLinkElem = $(".custom_select_main_link > span", selector);
oldName = mainLinkElem.text();
mainLinkElem = $(".custom_select_main_link", selector),
mainLinkSpan = $('span', mainLinkElem),
oldName = mainLinkSpan.text();
mainLinkElem
.attr('data-siteid', idsite)
.text(name);
mainLinkElem.attr('data-siteid', idsite);
mainLinkSpan.text(name);
$(this).text(oldName);
selector.trigger('piwik:siteSelected', {id: idsite, name: name});
......
Subproject commit e7b93068ef7df84cfdaa912ec613d9abb1a737fb
Subproject commit bfc771d9a6df886f9c149375e021b41d33bc11b4
Subproject commit 58a69c541f2d777cebe6d91eb1aa20ea5e8efd54
Subproject commit f1835149c88ef43f3b475d883a621fb8a22d1800
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter