Fixed collapse/expand toggle button to reflect on load state

AaronSadlerUK · Aug 16, 2021 · 191b265 · 191b265
1 parent f9e1def
commit 191b265
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/TestSite.V9/App_Plugins/UmbNav/js/umbnav.controller.js b/TestSite.V9/App_Plugins/UmbNav/js/umbnav.controller.js
@@ -35,10 +35,11 @@
  });
  };
 
- vm.toggleVar = false;
+
+ vm.toggleVar = vm.items.some((element) => element.collapsed === false);
  $scope.toggleCollapse = function () {
  vm.toggleVar = !vm.toggleVar;
- if (vm.toggleVar) {
+ if (!vm.toggleVar) {
  $scope.$broadcast('angular-ui-tree:collapse-all');
  } else {
  $scope.$broadcast('angular-ui-tree:expand-all');

diff --git a/TestSite.V9/App_Plugins/UmbNav/views/editor.html b/TestSite.V9/App_Plugins/UmbNav/views/editor.html
@@ -2,10 +2,10 @@
  <div class="umbnav-editor-buttons" ng-show="showExpandCollapseButtons() || vm.showTopAddButton">
  <span ng-show="showExpandCollapseButtons()">
  <button class="btn btn-primary" type="button" ng-click="toggleCollapse()">
- <span ng-show="vm.toggleVar">
+ <span ng-show="!vm.toggleVar">
  <localize key="umbnav_expandAll"></localize>
  </span>
- <span ng-show="!vm.toggleVar">
+ <span ng-show="vm.toggleVar">
  <localize key="umbnav_collapseAll"></localize>
  </span>
  </button>

diff --git a/TestSite/App_Plugins/UmbNav/js/umbnav.controller.js b/TestSite/App_Plugins/UmbNav/js/umbnav.controller.js
@@ -35,10 +35,11 @@
  });
  };
 
- vm.toggleVar = false;
+
+ vm.toggleVar = vm.items.some((element) => element.collapsed === false);
  $scope.toggleCollapse = function () {
  vm.toggleVar = !vm.toggleVar;
- if (vm.toggleVar) {
+ if (!vm.toggleVar) {
  $scope.$broadcast('angular-ui-tree:collapse-all');
  } else {
  $scope.$broadcast('angular-ui-tree:expand-all');

diff --git a/TestSite/App_Plugins/UmbNav/views/editor.html b/TestSite/App_Plugins/UmbNav/views/editor.html
@@ -2,10 +2,10 @@
  <div class="umbnav-editor-buttons" ng-show="showExpandCollapseButtons() || vm.showTopAddButton">
  <span ng-show="showExpandCollapseButtons()">
  <button class="btn btn-primary" type="button" ng-click="toggleCollapse()">
- <span ng-show="vm.toggleVar">
+ <span ng-show="!vm.toggleVar">
  <localize key="umbnav_expandAll"></localize>
  </span>
- <span ng-show="!vm.toggleVar">
+ <span ng-show="vm.toggleVar">
  <localize key="umbnav_collapseAll"></localize>
  </span>
  </button>

diff --git a/src/UmbNav.Web/App_Plugins/UmbNav/js/umbnav.controller.js b/src/UmbNav.Web/App_Plugins/UmbNav/js/umbnav.controller.js
@@ -35,10 +35,11 @@
  });
  };
 
- vm.toggleVar = false;
+
+ vm.toggleVar = vm.items.some((element) => element.collapsed === false);
  $scope.toggleCollapse = function () {
  vm.toggleVar = !vm.toggleVar;
- if (vm.toggleVar) {
+ if (!vm.toggleVar) {
  $scope.$broadcast('angular-ui-tree:collapse-all');
  } else {
  $scope.$broadcast('angular-ui-tree:expand-all');

diff --git a/src/UmbNav.Web/App_Plugins/UmbNav/views/editor.html b/src/UmbNav.Web/App_Plugins/UmbNav/views/editor.html
@@ -2,10 +2,10 @@
  <div class="umbnav-editor-buttons" ng-show="showExpandCollapseButtons() || vm.showTopAddButton">
  <span ng-show="showExpandCollapseButtons()">
  <button class="btn btn-primary" type="button" ng-click="toggleCollapse()">
- <span ng-show="vm.toggleVar">
+ <span ng-show="!vm.toggleVar">
  <localize key="umbnav_expandAll"></localize>
  </span>
- <span ng-show="!vm.toggleVar">
+ <span ng-show="vm.toggleVar">
  <localize key="umbnav_collapseAll"></localize>
  </span>
  </button>