Skip to content
Extraits de code Groupes Projets
Valider 3b367dd3 rédigé par Thomas ZILLIOX's avatar Thomas ZILLIOX
Parcourir les fichiers

Cleanup the javascript for the date selector

parent 9334f066
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -86,7 +86,6 @@ class Piwik_CoreHome extends Piwik_Plugin ...@@ -86,7 +86,6 @@ class Piwik_CoreHome extends Piwik_Plugin
$jsFiles[] = "plugins/CoreHome/javascripts/menu.js"; $jsFiles[] = "plugins/CoreHome/javascripts/menu.js";
$jsFiles[] = "plugins/CoreHome/javascripts/menu_init.js"; $jsFiles[] = "plugins/CoreHome/javascripts/menu_init.js";
$jsFiles[] = "plugins/CoreHome/javascripts/calendar.js"; $jsFiles[] = "plugins/CoreHome/javascripts/calendar.js";
$jsFiles[] = "plugins/CoreHome/javascripts/date.js";
$jsFiles[] = "plugins/CoreHome/javascripts/autocomplete.js"; $jsFiles[] = "plugins/CoreHome/javascripts/autocomplete.js";
$jsFiles[] = "plugins/CoreHome/javascripts/sparkline.js"; $jsFiles[] = "plugins/CoreHome/javascripts/sparkline.js";
$jsFiles[] = "plugins/CoreHome/javascripts/corehome.js"; $jsFiles[] = "plugins/CoreHome/javascripts/corehome.js";
......
...@@ -442,14 +442,14 @@ ...@@ -442,14 +442,14 @@
}); });
// reset date/period when opening calendar // reset date/period when opening calendar
var firstClick = true;
$('#periodString #date').click(function () { $('#periodString #date').click(function () {
if (!firstClick) { $("#periodMore").toggle();
datepickerElem.datepicker('setDate', currentDate); });
$('#period_id_' + piwik.period).click();
}
firstClick = false; $('body').on('click', function(e) {
if (!$(e.target).parents('#periodString').length && !$(e.target).is('#periodString') && !$(e.target).is('option') && $("#periodMore").is(":visible")) {
$("#periodMore").hide();
}
}); });
function onDateRangeSelect(dateText, inst) { function onDateRangeSelect(dateText, inst) {
......
/*!
* Piwik - Web Analytics
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
$(document).ready(function () {
//period widget handler
var periodWidget = {
show: function () {
this.isOpen = 1;
$("#periodMore").show();
},
hide: function () {
this.isOpen = 0;
$("#periodMore").hide();
},
toggle: function (e) {
if (!this.isOpen) this.show();
else this.hide();
}
};
$("#periodString #date")
.hover(function () {
$(this).css({ cursor: "pointer"});
}, function () {
})
.click(function () {
periodWidget.toggle();
if ($("#periodMore").is(":visible")) {
$("#periodMore .ui-state-highlight").removeClass('ui-state-highlight');
}
});
//close periodString onClickOutside
$('body').on('mouseup', function (e) {
if (!$(e.target).parents('#periodString').length && !$(e.target).is('#periodString') && !$(e.target).is('option') && periodWidget.isOpen) {
periodWidget.hide();
}
});
});
...@@ -126,7 +126,7 @@ a { ...@@ -126,7 +126,7 @@ a {
margin-right: 12px; margin-right: 12px;
z-index: 999; z-index: 999;
position: absolute; position: absolute;
background: url("../images/icon-calendar.gif") no-repeat scroll right 9px center #F7F7F7; background: url("../images/icon-calendar.gif") no-repeat scroll right 9px top 8px #F7F7F7;
} }
#periodString:hover { #periodString:hover {
...@@ -136,7 +136,6 @@ a { ...@@ -136,7 +136,6 @@ a {
#periodString #date { #periodString #date {
cursor: pointer; cursor: pointer;
display: inline-block;
padding: 5px 10px 6px 10px; padding: 5px 10px 6px 10px;
margin: -5px -10px -6px -10px; margin: -5px -10px -6px -10px;
......
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