diff options
author | Stefan Giehl <stefan@matomo.org> | 2021-03-21 18:34:03 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-21 18:34:03 +0300 |
commit | 9a9e57b2d5a60dee61bf5496067595f2d6f21a6f (patch) | |
tree | f17b6b094930a6678b117de5eb30b6e6f2285e3f /plugins/CoreHome/angularjs | |
parent | 59ee8ce9c8ced7c0fab5d5a910cb5ef4c3a901f4 (diff) |
Fix remaining regressions & ui tests (#17360)
* fix som ui tests
* improve randomly failing ui test
* Ensure not to abort ajax requests on initial page load
* updates expected ui files
* fix more ui tests
* adds missing ui screenshot
* updates expected ui file
Diffstat (limited to 'plugins/CoreHome/angularjs')
-rw-r--r-- | plugins/CoreHome/angularjs/reporting-menu/reportingmenu.controller.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.controller.js b/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.controller.js index 0928858d98..5a9f301370 100644 --- a/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.controller.js +++ b/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.controller.js @@ -24,6 +24,8 @@ var showSubcategoryHelpOnLoad = null; + var initialLoad = true; + $scope.currentCategory = piwikUrl.getSearchParam('category'); $scope.currentSubcategory = piwikUrl.getSearchParam('subcategory'); @@ -218,7 +220,9 @@ }); $rootScope.$on('piwikPageChange', function (event) { - globalAjaxQueue.abort(); + if (!initialLoad) { + globalAjaxQueue.abort(); + } $scope.helpShownCategory = null; $scope.currentCategory = piwikUrl.getSearchParam('category'); @@ -230,6 +234,8 @@ } $('#loadingError').hide(); + + initialLoad = false; }); } })(); |