Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsgiehl <stefan@piwik.org>2013-08-15 03:42:38 +0400
committersgiehl <stefan@piwik.org>2013-08-15 03:42:51 +0400
commit74bc8a331fe702422d9385fd195987a91582cbd3 (patch)
treee420047ec09c7563f2f8c7d7023f73c3a53f1e40 /plugins/Dashboard
parent14048028ea84c3aa4036fc0ea80217798c876d04 (diff)
refs #3763 do not close widgets&dashboards menu on click on an item within
Diffstat (limited to 'plugins/Dashboard')
-rw-r--r--plugins/Dashboard/javascripts/dashboard.js18
1 files changed, 10 insertions, 8 deletions
diff --git a/plugins/Dashboard/javascripts/dashboard.js b/plugins/Dashboard/javascripts/dashboard.js
index e2a73be1d3..21af3da624 100644
--- a/plugins/Dashboard/javascripts/dashboard.js
+++ b/plugins/Dashboard/javascripts/dashboard.js
@@ -28,15 +28,17 @@ function initDashboard(dashboardId, dashboardLayout) {
$('#Dashboard_embeddedIndex_' + dashboardId).addClass('sfHover');
}
- $('#dashboardSettings').on('click', function () {
- $('#dashboardSettings').toggleClass('visible');
- if ($('#dashboardWidgetsArea').dashboard('isDefaultDashboard')) {
- $('#removeDashboardLink').hide();
- } else {
- $('#removeDashboardLink').show();
+ $('#dashboardSettings').on('click', function (e) {
+ if ($(e.target).is('#dashboardSettings') || $(e.target).is('#dashboardSettings>span')) {
+ $('#dashboardSettings').toggleClass('visible');
+ if ($('#dashboardWidgetsArea').dashboard('isDefaultDashboard')) {
+ $('#removeDashboardLink').hide();
+ } else {
+ $('#removeDashboardLink').show();
+ }
+ // fix position
+ $('#dashboardSettings').find('.widgetpreview-widgetlist').css('paddingTop', $('#dashboardSettings').find('.widgetpreview-categorylist').parent('li').position().top);
}
- // fix position
- $('#dashboardSettings').find('.widgetpreview-widgetlist').css('paddingTop', $('#dashboardSettings').find('.widgetpreview-categorylist').parent('li').position().top);
});
$('body').on('mouseup', function (e) {
if (!$(e.target).parents('#dashboardSettings').length && !$(e.target).is('#dashboardSettings')) {