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

Fix pressing enter in a property editor name field (#13329)

Browse Source 
Co-authored-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
(cherry picked from commit 7349ae1c5c)
This commit is contained in:
Matthew Care
2023-03-28 12:53:13 +02:00
committed by Sebastiaan Janssen
parent 6bc999bca4
commit 06f527e87b
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
View File

@@ -796,6 +796,7 @@ input.umb-group-builder__group-sort-value {
transform: translate(0, -50%);
}
input.editor-label,
textarea.editor-label {
border-color: transparent;
box-shadow: none;

2
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
View File

@@ -15,7 +15,7 @@
var vm = this;
const dataTypesCanBeChangedConfig = window.Umbraco.Sys.ServerVariables.umbracoSettings.dataTypesCanBeChanged;
vm.allowChangeDataType = false;
vm.changeDataTypeHelpTextIsVisible = false;
vm.propertyTypeHasValues = false;

12
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
View File

@@ -20,7 +20,8 @@
<div class="umb-control-group -no-border" ng-if="!model.property.locked">
<div class="control-group -no-margin">
<textarea class="editor-label"
<input type="text"
class="editor-label"
data-element="property-name"
name="propertyLabel"
ng-model="model.property.label"
@@ -28,10 +29,8 @@
placeholder="@placeholders_entername"
umb-auto-focus
focus-on-filled="true"
umb-auto-resize
required
ng-keypress="vm.submitOnEnter($event)">
</textarea>
ng-keypress="vm.submitOnEnter($event)" />
<div ng-messages="propertySettingsForm.propertyLabel.$error" show-validation-on-submit>
<span class="umb-validation-label" ng-message="required">Required label</span>
</div>
@@ -47,11 +46,10 @@
ng-model="model.property.description"
localize="placeholder"
placeholder="@placeholders_enterDescription"
ng-keypress="vm.submitOnEnter($event)"
umb-auto-resize>
</textarea>
</div>
<ng-form name="dataTypeForm">
<div class="umb-control-group control-group" ng-model="model.property.editor" name="selectedEditor" val-require-component ng-if="!model.property.locked">
<umb-button
@@ -82,7 +80,7 @@
allow-change="vm.allowChangeDataType"
on-change="vm.openDataTypePicker(model.property)">
</umb-node-preview>
<div ng-if="vm.changeDataTypeHelpTextIsVisible" class="mt2 umb-alert umb-alert--info">
<localize key="contentTypeEditor_changeDataTypeHelpText">
</div>