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

Merge remote-tracking branch 'origin/v9/dev' into v9/bugfix/AB13489-no-error-when-exceeding-maxAllowedContentLength

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js
This commit is contained in:
Bjarke Berg
2021-09-20 07:44:20 +02:00
parent 45a9a94aba 898f270c69
commit c7fcb4abaa
21 changed files with 1410 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

14
src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js
View File

@@ -67,13 +67,13 @@ angular.module("umbraco.directives")
Utilities.forEach(files, file => {
if (_filterFile(file) === true) {
if (file.$error) {
scope.rejected.push(file);
} else {
scope.queue.push(file);
}
if (file.$error) {
scope.rejected.push(file);
} else {
scope.queue.push(file);
}
});
}
});
//when queue is done, kick the uploader
if (!scope.working) {
@@ -192,7 +192,7 @@ angular.module("umbraco.directives")
// if queue has no items so there is nothing to choose a type for
return false;
}
if (scope.acceptedMediatypes.length === 1) {
// if only one accepted type, then we wont ask to choose.
return false;

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

@@ -75,7 +75,7 @@
});
saveModel.groups = _.map(realGroups, function (g) {
var saveGroup = _.pick(g, 'inherited', 'id', 'sortOrder', 'name', 'alias', 'type');
var saveGroup = _.pick(g, 'inherited', 'id', 'sortOrder', 'name', 'key', 'alias', 'type');
var realProperties = _.reject(g.properties, function (p) {
//do not include these properties

4
src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tabs-nav.html
View File

@@ -1,6 +1,6 @@
<ul role="tablist" class="umb-tabs-nav">
<li class="umb-tab" ng-repeat="tab in vm.tabs | limitTo: vm.maxTabs" data-element="tab-{{tab.alias}}" ng-class="{'umb-tab--active': tab.active, 'umb-tab--error': valTab_tabHasError}" val-tab>
<button class="btn-reset umb-tab-button" ng-click="vm.clickTab($event, tab)" role="tab" aria-selected="{tab.active}" type="button">
<button class="btn-reset umb-tab-button" ng-click="vm.clickTab($event, tab)" role="tab" aria-selected="{{tab.active}}" type="button">
{{ tab.label }}
<div ng-show="valTab_tabHasError && !tab.active" class="badge">!</div>
</button>
@@ -23,7 +23,7 @@
ng-class="{'dropdown-menu--active': tab.active}"
ng-click="vm.clickTab($event, tab)"
role="tab"
aria-selected="{tab.active}" >
aria-selected="{{tab.active}}" >
{{ tab.label }}
<div ng-show="valTab_tabHasError && !tab.active" class="badge">!</div>
</button>