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

Merge remote-tracking branch 'origin/v8/dev' into netcore/feature/merge-v8-05032021

Browse Source 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web/Editors/Filters/UserGroupValidateAttribute.cs
#	src/Umbraco.Web/Editors/PasswordChanger.cs
#	src/Umbraco.Web/Editors/UserGroupsController.cs
This commit is contained in:
Bjarke Berg
2021-03-09 10:08:53 +01:00
parent d81874aee3 745014a4c3
commit 1aa8d3aa09
12 changed files with 188 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Umbraco.Web.UI.Client/package-lock.json generated
View File

@@ -2734,7 +2734,7 @@
"cli-color": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/cli-color/-/cli-color-1.4.0.tgz",
"integrity": "sha1-fRBzj0hSaCT4/n2lGFfLD1cv4B8=",
"integrity": "sha512-xu6RvQqqrWEo6MPR1eixqGPywhYBHRs653F9jfXB2Hx4jdM/3WxiNE1vppRmxtMIfl16SFYTpYlrnqH/HsK/2w==",
"dev": true,
"requires": {
"ansi-regex": "^2.1.1",
@@ -2968,7 +2968,7 @@
"color": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz",
"integrity": "sha1-2SC0Mo1TSjrIKV1o971LpsQnvpo=",
"integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==",
"dev": true,
"requires": {
"color-convert": "^1.9.1",
@@ -3859,7 +3859,7 @@
"diagnostics": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz",
"integrity": "sha1-yrasM99wydmnJ0kK5DrJladpsio=",
"integrity": "sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==",
"dev": true,
"requires": {
"colorspace": "1.1.x",
@@ -3954,7 +3954,7 @@
"domhandler": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
"integrity": "sha1-iAUJfpM9ZehVRvcm1g9euItE+AM=",
"integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
"dev": true,
"requires": {
"domelementtype": "1"
@@ -4229,7 +4229,7 @@
"debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
"integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
"dev": true,
"requires": {
"ms": "2.0.0"
@@ -4406,7 +4406,7 @@
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true,
"optional": true
}
@@ -8814,7 +8814,7 @@
"kuler": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz",
"integrity": "sha1-73x4TzbJ+24W3TFQ0VJneysCKKY=",
"integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==",
"dev": true,
"requires": {
"colornames": "^1.1.1"
@@ -9386,7 +9386,7 @@
"memoizee": {
"version": "0.4.14",
"resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
"integrity": "sha1-B6APIEaZ+alcLZ53IYJxx81hDVc=",
"integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
"dev": true,
"requires": {
"d": "1",
@@ -9511,7 +9511,7 @@
"minimize": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/minimize/-/minimize-2.2.0.tgz",
"integrity": "sha1-ixZ28wBR2FmNdDZGvRJpCwdNpMM=",
"integrity": "sha512-IxR2XMbw9pXCxApkdD9BTcH2U4XlXhbeySUrv71rmMS9XDA8BVXEsIuFu24LtwCfBgfbL7Fuh8/ZzkO5DaTLlQ==",
"dev": true,
"requires": {
"argh": "^0.1.4",
@@ -9536,7 +9536,7 @@
"is-extendable": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
"integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
"dev": true,
"requires": {
"is-plain-object": "^2.0.4"
@@ -15048,7 +15048,7 @@
"debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
"integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
"dev": true,
"requires": {
"ms": "2.0.0"
@@ -15646,7 +15646,7 @@
"text-hex": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
"integrity": "sha1-adycGxdEbueakr9biEu0uRJ1BvU=",
"integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==",
"dev": true
},
"text-table": {
@@ -15738,7 +15738,7 @@
"timers-ext": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
"integrity": "sha1-b1ethXjgej+5+R2Th9ZWR1VeJcY=",
"integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
"dev": true,
"requires": {
"es5-ext": "~0.10.46",

6
src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js
View File

@@ -20,11 +20,7 @@ function umbFileUpload() {
el.val('');
});
el.on('drag dragstart dragend dragover dragenter dragleave drop', function (e) {
e.preventDefault();
e.stopPropagation();
})
.on('dragover dragenter', function () {
el.on('dragover dragenter', function () {
scope.$emit("isDragover", { value: true });
})
.on('dragleave dragend drop', function () {

20
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js
View File

@@ -16,7 +16,25 @@ function ConfigController($scope) {
$scope.model.close();
}
}
vm.showEmptyState = false;
vm.showConfig = false;
vm.showStyles = false;
$scope.$watchCollection('model.config', onWatch);
$scope.$watchCollection('model.styles', onWatch);
function onWatch() {
vm.showConfig = $scope.model.config &&
($scope.model.config.length > 0 || Object.keys($scope.model.config).length > 0);
vm.showStyles = $scope.model.styles &&
($scope.model.styles.length > 0 || Object.keys($scope.model.styles).length > 0);
vm.showEmptyState = vm.showConfig === false && vm.showStyles === false;
}
}
angular.module("umbraco").controller("Umbraco.PropertyEditors.GridPrevalueEditor.ConfigController", ConfigController);

8
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.html
View File

@@ -13,11 +13,11 @@
<umb-editor-container>
<ng-form name="gridItemConfigEditor" val-form-manager>
<umb-empty-state position="center" ng-if="model.config.length === 0 && model.styles.length === 0">
<umb-empty-state position="center" ng-if="vm.showEmptyState">
<localize key="grid_noConfiguration">No further configuration available</localize>
</umb-empty-state>
<umb-box ng-if="model.config && model.config.length > 0">
<umb-box ng-if="vm.showConfig">
<umb-box-header title-key="grid_settings"></umb-box-header>
<umb-box-content>
<div>
@@ -29,7 +29,7 @@
</umb-box-content>
</umb-box>
<umb-box ng-if="model.styles && model.styles.length > 0">
<umb-box ng-if="vm.showStyles">
<umb-box-header title-key="grid_styles"></umb-box-header>
<umb-box-content>
<div>
@@ -52,7 +52,7 @@
shortcut="esc"
action="vm.close()">
</umb-button>
<umb-button ng-if="(model.config && model.config.length > 0) || (model.styles && model.styles.length > 0)"
<umb-button ng-if="vm.showConfig || vm.showStyles"
type="button"
button-style="success"
label-key="general_submit"