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

open context menu dialog based on appState instead of dialogService

Browse Source
This commit is contained in:
Mads Rasmussen
2018-11-13 14:25:15 +01:00
parent 530a3e2439
commit 259e17b45d
6 changed files with 46 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbcontextdialog/umbcontextdialog.directive.js Normal file
View File

@@ -0,0 +1,21 @@
(function() {
'use strict';
function UmbContextDialog() {
var directive = {
restrict: 'E',
transclude: true,
templateUrl: "views/components/tree/umbcontextdialog/umb-context-dialog.html",
scope: {
title: "<",
currentNode: "<",
view: "<"
}
};
return directive;
}
angular.module('umbraco.directives').directive('umbContextDialog', UmbContextDialog);
})();

2
src/Umbraco.Web.UI.Client/src/common/services/appstate.service.js
View File

@@ -70,6 +70,8 @@ function appState(eventsService) {
currentNode: null,
//Whether the menu's dialog is being shown or not
showMenuDialog: null,
// The dialogs template
dialogTemplateUrl: null,
//Whether the context menu is being shown or not
showMenu: null
};

65
src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
View File

@@ -404,19 +404,13 @@ function navigationService($rootScope, $routeParams, $location, $q, $timeout, $i
//NOTE: This is assigning the current action node - this is not the same as the currently selected node!
appState.setMenuState("currentNode", args.node);
//ensure the current dialog is cleared before creating another!
if (currentDialog) {
dialogService.close(currentDialog);
}
var dialog = self.showDialog({
self.showDialog({
node: args.node,
action: found,
section: appState.getSectionState("currentSection")
});
//return the dialog this is opening.
return $q.resolve(dialog);
return $q.resolve();
}
}
@@ -545,22 +539,6 @@ function navigationService($rootScope, $routeParams, $location, $q, $timeout, $i
throw "The args parameter must have a 'node' as the active tree node";
}
//ensure the current dialog is cleared before creating another!
if (currentDialog) {
dialogService.close(currentDialog);
currentDialog = null;
}
setMode("dialog");
//NOTE: Set up the scope object and assign properties, this is legacy functionality but we have to live with it now.
// we should be passing in currentNode and currentAction using 'dialogData' for the dialog, not attaching it to a scope.
// This scope instance will be destroyed by the dialog so it cannot be a scope that exists outside of the dialog.
// If a scope instance has been passed in, we'll have to create a child scope of it, otherwise a new root scope.
var dialogScope = args.scope ? args.scope.$new() : $rootScope.$new();
dialogScope.currentNode = args.node;
dialogScope.currentAction = args.action;
//the title might be in the meta data, check there first
if (args.action.metaData["dialogTitle"]) {
appState.setMenuState("dialogTitle", args.action.metaData["dialogTitle"]);
@@ -570,15 +548,9 @@ function navigationService($rootScope, $routeParams, $location, $q, $timeout, $i
}
var templateUrl;
var iframe;
if (args.action.metaData["actionUrl"]) {
templateUrl = args.action.metaData["actionUrl"];
iframe = true;
}
else if (args.action.metaData["actionView"]) {
if (args.action.metaData["actionView"]) {
templateUrl = args.action.metaData["actionView"];
iframe = false;
}
else {
@@ -604,35 +576,14 @@ function navigationService($rootScope, $routeParams, $location, $q, $timeout, $i
templateUrl = "views/" + treeAlias + "/" + args.action.alias + ".html";
}
iframe = false;
}
//TODO: some action's want to launch a new window like live editing, we support this in the menu item's metadata with
// a key called: "actionUrlMethod" which can be set to either: Dialog, BlankWindow. Normally this is always set to Dialog
// if a URL is specified in the "actionUrl" metadata. For now I'm not going to implement launching in a blank window,
// though would be v-easy, just not sure we want to ever support that?
setMode("dialog");
var dialog = dialogService.open(
{
container: $("#dialog div.umb-modalcolumn-body"),
//The ONLY reason we're passing in scope to the dialogService (which is legacy functionality) is
// for backwards compatibility since many dialogs require $scope.currentNode or $scope.currentAction
// to exist
scope: dialogScope,
inline: true,
show: true,
iframe: iframe,
modalClass: "umb-dialog",
template: templateUrl,
//These will show up on the dialog controller's $scope under dialogOptions
currentNode: args.node,
currentAction: args.action
});
//save the currently assigned dialog so it can be removed before a new one is created
currentDialog = dialog;
return dialog;
if(templateUrl) {
appState.setMenuState("dialogTemplateUrl", templateUrl);
}
},
/**

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

@@ -168,6 +168,9 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
if (args.key === "showMenuDialog") {
$scope.showContextMenuDialog = args.value;
}
if (args.key === "dialogTemplateUrl") {
$scope.dialogTemplateUrl = args.value;
}
if (args.key === "showMenu") {
$scope.showContextMenu = args.value;
}

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

@@ -36,15 +36,13 @@
</umb-context-menu>
</div>
<umb-context-dialog
ng-if="showContextMenuDialog"
title="menuDialogTitle"
current-node="menuNode"
view="dialogTemplateUrl">
</umb-context-dialog>
<!-- Tree dialogs -->
<div id="dialog" class='umb-modalcolumn fill shadow' ng-show="showContextMenuDialog" ng-animate="'slide'">
<div class='umb-modalcolumn-header'>
<h1>{{menuDialogTitle}}</h1>
</div>
<div class='umb-modalcolumn-body'>
</div>
</div>
</div>
</div>

6
src/Umbraco.Web.UI.Client/src/views/components/tree/umbcontextdialog/umb-context-dialog.html Normal file
View File

@@ -0,0 +1,6 @@
<div id="dialog" class="umb-modalcolumn fill shadow">
<div class="umb-modalcolumn-header">
<h1>{{title}}</h1>
</div>
<div class="umb-modalcolumn-body" ng-include="view"></div>
</div>