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:
authorThomas Steur <tsteur@users.noreply.github.com>2018-11-30 05:12:30 +0300
committerdiosmosis <diosmosis@users.noreply.github.com>2018-11-30 05:12:30 +0300
commite11866e11ddad88dbf7aee5f56431c8958acdb02 (patch)
tree44724cfc732075d83bdcb5b25291ef318175f09b /plugins/Dashboard
parent39deb5d94d575baa2e72ef901e1ea1753509504b (diff)
"Loading data.." is not always displayed when changing dates in the dashboard (#13498)
Diffstat (limited to 'plugins/Dashboard')
-rw-r--r--plugins/Dashboard/angularjs/dashboard/dashboard.directive.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/Dashboard/angularjs/dashboard/dashboard.directive.js b/plugins/Dashboard/angularjs/dashboard/dashboard.directive.js
index 141be1a97d..3575b455bc 100644
--- a/plugins/Dashboard/angularjs/dashboard/dashboard.directive.js
+++ b/plugins/Dashboard/angularjs/dashboard/dashboard.directive.js
@@ -64,7 +64,7 @@
var getDashboard = dashboardsModel.getDashboard(dashboardId);
var getLayout = dashboardsModel.getDashboardLayout(dashboardId);
- $q.all([getDashboard, getLayout]).then(function (response) {
+ return $q.all([getDashboard, getLayout]).then(function (response) {
var dashboard = response[0];
var layout = response[1];
@@ -89,7 +89,7 @@
scope.$parent.fetchDashboard = function (dashboardId) {
scope.dashboardId = dashboardId;
- fetchDashboard(dashboardId)
+ return fetchDashboard(dashboardId)
};
fetchDashboard(scope.dashboardid);