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

9841: Don't focus on nested content node at page load (#9863)

Browse Source 
Tested and can confirm that this fixes the focus issue.
This commit is contained in:
patrickdemooij9
2021-02-24 23:16:40 +01:00
committed by GitHub
parent b019bc0ccf
commit 6b3202e37b
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
View File

@@ -105,12 +105,13 @@
localizationService.localizeMany(["grid_addElement", "content_createEmpty", "actions_copy"]).then(function (data) {
labels.grid_addElement = data[0];
labels.content_createEmpty = data[1];
labels.copy_icon_title = data[2]
labels.copy_icon_title = data[2];
});
function setCurrentNode(node) {
function setCurrentNode(node, focusNode) {
updateModel();
vm.currentNode = node;
vm.focusOnNode = focusNode;
}
var copyAllEntries = function () {
@@ -180,7 +181,7 @@
var newNode = createNode(scaffold, null);
setCurrentNode(newNode);
setCurrentNode(newNode, true);
setDirty();
validate();
};
@@ -202,7 +203,6 @@
});
const dialog = {
view: "itempicker",
orderBy: "$index",
view: "itempicker",
event: $event,
@@ -277,9 +277,9 @@
vm.editNode = function (idx) {
if (vm.currentNode && vm.currentNode.key === vm.nodes[idx].key) {
setCurrentNode(null);
setCurrentNode(null, false);
} else {
setCurrentNode(vm.nodes[idx]);
setCurrentNode(vm.nodes[idx], true);
}
};
@@ -500,7 +500,7 @@
setDirty();
//updateModel();// done by setting current node...
setCurrentNode(newNode);
setCurrentNode(newNode, true);
}
function checkAbilityToPasteContent() {
@@ -592,7 +592,7 @@
// If there is only one item, set it as current node
if (vm.singleMode || (vm.nodes.length === 1 && vm.maxItems === 1)) {
setCurrentNode(vm.nodes[0]);
setCurrentNode(vm.nodes[0], false);
}
validate();