yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V8: On smaller screens, trees should close when you click outside them (#7018)

Browse Source
This commit is contained in:
Kenn Jacobsen
2019-12-19 15:15:46 +01:00
committed by Poornima Nayar
parent 1f6534739d
commit 6241603c33
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/navigation.controller.js
View File

@@ -510,6 +510,14 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
if (!event) {
return;
}
closeTree();
};
$scope.onOutsideClick = function() {
closeTree();
};
function closeTree() {
if (!appState.getGlobalState("touchDevice")) {
treeActive = false;
$timeout(function () {
@@ -518,7 +526,7 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
}
}, 300);
}
};
}
$scope.toggleLanguageSelector = function () {
$scope.page.languageSelectorIsOpen = !$scope.page.languageSelectorIsOpen;

2
src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
View File

@@ -1,4 +1,4 @@
<div id="leftcolumn" ng-controller="Umbraco.NavigationController" ng-mouseleave="leaveTree($event)" ng-mouseenter="enterTree($event)">
<div id="leftcolumn" ng-controller="Umbraco.NavigationController" ng-mouseleave="leaveTree($event)" ng-mouseenter="enterTree($event)" on-outside-click="onOutsideClick()">
<!-- navigation container -->
<div id="navigation" ng-show="showNavigation" class="fill umb-modalcolumn" ng-animate="'slide'" nav-resize