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 <thomas.steur@gmail.com>2015-10-19 17:47:52 +0300
committerThomas Steur <thomas.steur@gmail.com>2015-10-19 17:47:52 +0300
commita9050bf848a25efb22235a944a107104a79d0574 (patch)
treea55dc72c2bdaceb22b320ec627ad4614d300fff9 /plugins/CoreHome
parent8789a2c17c535af2b531f4d4cb231a971d4eb321 (diff)
refs #9032 #9038 reimplement menu behaviour when clicking on a already menu item and when category contains only one item
Diffstat (limited to 'plugins/CoreHome')
-rw-r--r--plugins/CoreHome/angularjs/reporting-menu/reportingmenu.controller.js21
1 files changed, 19 insertions, 2 deletions
diff --git a/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.controller.js b/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.controller.js
index 719058da29..add0b3fc8b 100644
--- a/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.controller.js
+++ b/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.controller.js
@@ -82,8 +82,25 @@
}
$scope.loadCategory = function (category) {
- markAllCategoriesAsInactive();
- category.active = true;
+ if (category.active) {
+ category.active = false;
+ } else {
+ markAllCategoriesAsInactive();
+ category.active = true;
+ }
+
+ if (category.active && category.subcategories && category.subcategories.length === 1) {
+ var subcategory = category.subcategories[0];
+
+ if (subcategory.active) {
+ // we need to manually trigger change as URL would not change and therefore page would not be
+ // reloaded
+ $scope.loadSubcategory(category, subcategory);
+ } else {
+ var url = $scope.makeUrl(category, subcategory);
+ $location.search(url);
+ }
+ }
};
$scope.loadSubcategory = function (category, subcategory) {