Skip to content

Adjust example for overlay in umb-child-selector #8045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nul800sebastiaan merged 5 commits into from
Jul 9, 2020
Merged

Adjust example for overlay in umb-child-selector #8045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f66c799
Add aria-hidden to icon
May 1, 2020
cb9839e
Adjust overlay in controllers using umb-child-selector component.
May 1, 2020
b69d807
Remove umb-overlay from example since overlayService is used.
May 1, 2020
420b55f
Update example with overlayService since this is used in core.
May 1, 2020
2e0504e
Merge branch 'v8/contrib' into pr/8045
nul800sebastiaan Jul 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,6 @@ Use this directive to render a ui component for selecting child items to a paren
on-remove="vm.removeChild">
</umb-child-selector>

<!-- use overlay to select children from -->
<umb-overlay
ng-if="vm.overlay.show"
model="vm.overlay"
position="target"
view="vm.overlay.view">
</umb-overlay>

</div>
</pre>

Expand All @@ -37,7 +29,7 @@ Use this directive to render a ui component for selecting child items to a paren
(function () {
"use strict";

function Controller() {
function Controller(overlayService) {

var vm = this;

Expand All @@ -64,23 +56,29 @@ Use this directive to render a ui component for selecting child items to a paren
vm.removeChild = removeChild;

function addChild($event) {
vm.overlay = {

const dialog = {
view: "itempicker",
title: "Choose child",
availableItems: vm.availableChildren,
selectedItems: vm.selectedChildren,
event: $event,
show: true,
submit: function(model) {

// add selected child
vm.selectedChildren.push(model.selectedItem);

if (model.selectedItem) {
// add selected child
vm.selectedChildren.push(model.selectedItem);
}

// close overlay
vm.overlay.show = false;
vm.overlay = null;
overlayService.close();
},
close: function() {
overlayService.close();
}
};

overlayService.open(dialog);
}

function removeChild($index) {
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="umb-child-selector__child -parent">
<div class="umb-child-selector__child-description">
<div class="umb-child-selector__child-icon-holder">
<i class="umb-child-selector__child-icon {{ parentIcon }}"></i>
<i class="umb-child-selector__child-icon {{ parentIcon }}" aria-hidden="true"></i>
</div>
<span class="umb-child-selector__child-name">
<strong>{{ parentName }}</strong>
Expand Down
21 changes: 11 additions & 10 deletions ...Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,9 @@
/* ----------- SCOPE VARIABLES ----------- */

var vm = this;
var childNodeSelectorOverlayTitle = "";

vm.contentTypes = [];
vm.selectedChildren = [];

vm.overlayTitle = "";
vm.showAllowSegmentationOption = Umbraco.Sys.ServerVariables.umbracoSettings.showAllowSegmentationForDocumentTypes || false;

vm.addChild = addChild;
Expand Down Expand Up @@ -65,25 +62,29 @@
}

function addChild($event) {
var childNodeSelectorOverlay = {

const dialog = {
view: "itempicker",
title: childNodeSelectorOverlayTitle,
availableItems: vm.contentTypes,
selectedItems: vm.selectedChildren,
position: "target",
event: $event,
submit: function(model) {
vm.selectedChildren.push(model.selectedItem);
$scope.model.allowedContentTypes.push(model.selectedItem.id);
submit: function (model) {
if (model.selectedItem) {
vm.selectedChildren.push(model.selectedItem);
$scope.model.allowedContentTypes.push(model.selectedItem.id);
}
overlayService.close();
},
close: function() {
overlayService.close();
}
};

overlayService.open(childNodeSelectorOverlay);

localizationService.localize("contentTypeEditor_chooseChildNode").then(value => {
dialog.title = value;
overlayService.open(dialog);
});
}

function removeChild(selectedChild, index) {
Expand Down
23 changes: 12 additions & 11 deletions src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
/* ----------- SCOPE VARIABLES ----------- */

var vm = this;
var childNodeSelectorOverlayTitle = "";

vm.mediaTypes = [];
vm.selectedChildren = [];
Expand All @@ -22,10 +21,6 @@

function init() {

localizationService.localize("contentTypeEditor_chooseChildNode").then(function(value){
childNodeSelectorOverlayTitle = value;
});

mediaTypeResource.getAll().then(function(mediaTypes){

vm.mediaTypes = mediaTypes;
Expand All @@ -44,23 +39,29 @@
}

function addChild($event) {
var childNodeSelectorOverlay = {

var dialog = {
view: "itempicker",
title: childNodeSelectorOverlayTitle,
availableItems: vm.mediaTypes,
selectedItems: vm.selectedChildren,
position: "target",
event: $event,
submit: function(model) {
vm.selectedChildren.push(model.selectedItem);
$scope.model.allowedContentTypes.push(model.selectedItem.id);
submit: function (model) {
if (model.selectedItem) {
vm.selectedChildren.push(model.selectedItem);
$scope.model.allowedContentTypes.push(model.selectedItem.id);
}
overlayService.close();
},
close: function() {
overlayService.close();
}
};
overlayService.open(childNodeSelectorOverlay);

localizationService.localize("contentTypeEditor_chooseChildNode").then(value => {
dialog.title = value;
overlayService.open(dialog);
});
}

function removeChild(selectedChild, index) {
Expand Down