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

Merge pull request #3786 from umbraco/temp8-3651

Browse Source 
add overlay to tree when infinite editing is open
This commit is contained in:
Warren Buckley
2018-12-03 09:21:41 +00:00
committed by GitHub
parent a40a6fbe8f 7032f1424d
commit dd7b4669d5
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@ function MainController($scope, $location, appState, treeService, notificationsS
//the null is important because we do an explicit bool check on this in the view
$scope.authenticated = null;
$scope.touchDevice = appState.getGlobalState("touchDevice");
$scope.editors = [];
$scope.infiniteMode = false;
$scope.overlay = {};
$scope.drawer = {};
$scope.search = {};
@@ -160,12 +160,12 @@ function MainController($scope, $location, appState, treeService, notificationsS
}));
// event for infinite editors
evts.push(eventsService.on("appState.editors.add", function (name, args) {
$scope.editors = args.editors;
evts.push(eventsService.on("appState.editors.open", function (name, args) {
$scope.infiniteMode = args && args.editors.length > 0 ? true : false;
}));
evts.push(eventsService.on("appState.editors.remove", function (name, args) {
$scope.editors = args.editors;
evts.push(eventsService.on("appState.editors.close", function (name, args) {
$scope.infiniteMode = args && args.editors.length > 0 ? true : false;
}));
//ensure to unregister from all events!

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

@@ -241,6 +241,15 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
init();
}));
// event for infinite editors
evts.push(eventsService.on("appState.editors.open", function (name, args) {
$scope.infiniteMode = args && args.editors.length > 0 ? true : false;
}));
evts.push(eventsService.on("appState.editors.close", function (name, args) {
$scope.infiniteMode = args && args.editors.length > 0 ? true : false;
}));
/**
* Based on the current state of the application, this configures the scope variables that control the main tree and language drop down
*/

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

@@ -19,7 +19,7 @@
<div id="tree" ng-show="authenticated">
<umb-tree
api="treeApi"
on-init="onTreeInit()" >
on-init="onTreeInit()">
</umb-tree>
</div>
</div>
@@ -44,6 +44,9 @@
</umb-context-dialog>
</div>
<div class="umb-editor__overlay" ng-show="infiniteMode"></div>
</div>
</div>