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:
Diffstat (limited to 'plugins/Annotations/javascripts/annotations.js')
-rwxr-xr-xplugins/Annotations/javascripts/annotations.js13
1 files changed, 12 insertions, 1 deletions
diff --git a/plugins/Annotations/javascripts/annotations.js b/plugins/Annotations/javascripts/annotations.js
index 85b70f070c..8ab218ef22 100755
--- a/plugins/Annotations/javascripts/annotations.js
+++ b/plugins/Annotations/javascripts/annotations.js
@@ -519,6 +519,12 @@
loadingAnnotationManager = true;
+ var isDashboard = !!$('#dashboardWidgetsArea').length;
+
+ if (isDashboard) {
+ $('.loadingPiwikBelow', domElem).insertAfter($('.evolution-annotations', domElem));
+ }
+
var loading = $('.loadingPiwikBelow', domElem).css({display: 'block'});
// the annotations for this report have not been retrieved yet, so do an ajax request
@@ -539,7 +545,12 @@
loading.css('visibility', 'hidden');
// add & show annotation manager
- $('.dataTableFeatures', domElem).append(manager);
+ if (isDashboard) {
+ manager.insertAfter($('.evolution-annotations', domElem));
+ } else {
+ $('.dataTableFeatures', domElem).append(manager);
+ }
+
manager.slideDown('slow', function () {
loading.hide().css('visibility', 'visible');
loadingAnnotationManager = false;