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

V8.7RC Fix block list console errors in document type (#8685)

Browse Source
This commit is contained in:
Bjarne Fyrstenborg
2020-08-26 20:16:39 +02:00
committed by GitHub
parent 7f4ab750a8
commit 93ab77b400
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
View File

@@ -34,8 +34,8 @@
var modelObject;
// Property actions:
var copyAllBlocksAction;
var deleteAllBlocksAction;
var copyAllBlocksAction = null;
var deleteAllBlocksAction = null;
var inlineEditing = false;
var liveEditing = true;
@@ -107,14 +107,15 @@
icon: "documents",
method: requestCopyAllBlocks,
isDisabled: true
}
};
deleteAllBlocksAction = {
labelKey: 'clipboard_labelForRemoveAllEntries',
labelTokens: [],
icon: 'trash',
method: requestDeleteAllBlocks,
isDisabled: true
}
};
var propertyActions = [
copyAllBlocksAction,
@@ -609,30 +610,31 @@
function onAmountOfBlocksChanged() {
// enable/disable property actions
copyAllBlocksAction.isDisabled = vm.layout.length === 0;
deleteAllBlocksAction.isDisabled = vm.layout.length === 0;
if (copyAllBlocksAction) {
copyAllBlocksAction.isDisabled = vm.layout.length === 0;
}
if (deleteAllBlocksAction) {
deleteAllBlocksAction.isDisabled = vm.layout.length === 0;
}
// validate limits:
if (vm.propertyForm) {
if (vm.propertyForm && vm.validationLimit) {
var isMinRequirementGood = vm.validationLimit.min === null || vm.layout.length >= vm.validationLimit.min;
vm.propertyForm.minCount.$setValidity("minCount", isMinRequirementGood);
var isMaxRequirementGood = vm.validationLimit.max === null || vm.layout.length <= vm.validationLimit.max;
vm.propertyForm.maxCount.$setValidity("maxCount", isMaxRequirementGood);
}
}
unsubscribe.push($scope.$watch(() => vm.layout.length, onAmountOfBlocksChanged));
unsubscribe.push($scope.$watch(() => vm.layout.length, onAmountOfBlocksChanged));
$scope.$on("$destroy", function () {
for (const subscription of unsubscribe) {
subscription();
}
});
}
})();