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

don't overwrite linkpicker title when you pick from tree IF

Browse Source 
the editor has just typed into the linktitle
This commit is contained in:
Marc Goodson
2023-10-18 13:20:39 +01:00
committed by Jason Elkin
parent fb73a6a66b
commit b9c7de39ed
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
View File

@@ -33,6 +33,8 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
selectedSearchResults: []
};
$scope.userLinkNameInput = '';
$scope.showTarget = $scope.model.hideTarget !== true;
$scope.showAnchor = $scope.model.hideAnchor !== true;
@@ -143,7 +145,9 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
$scope.currentNode.selected = true;
$scope.model.target.id = args.node.id;
$scope.model.target.udi = args.node.udi;
$scope.model.target.name = args.node.name;
if ($scope.oKToUpdateLinkTargetName()) {
$scope.model.target.name = args.node.name;
}
if (args.node.id < 0) {
$scope.model.target.url = "/";
@@ -167,7 +171,18 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
openMiniListView(args.node);
}
}
$scope.trackUserInput = function (userInput) {
$scope.userLinkNameInput = userInput;
}
$scope.oKToUpdateLinkTargetName = function () {
if (!$scope.userLinkNameInput || !$scope.model.target.name) {
return true;
}
else {
return false;
}
}
$scope.switchToMediaPicker = function () {
userService.getCurrentUser().then(function (userData) {
@@ -190,8 +205,10 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
$scope.model.target.id = media.id;
$scope.model.target.udi = media.udi;
$scope.model.target.isMedia = true;
$scope.model.target.isMedia = true;
if ($scope.oKToUpdateLinkTargetName()) {
$scope.model.target.name = media.name;
}
$scope.model.target.url = media.image;
editorService.close();

1
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
View File

@@ -49,6 +49,7 @@
placeholder="@placeholders_entername"
class="umb-property-editor umb-textstring"
ng-model="model.target.name"
ng-change="trackUserInput(model.target.name)"
id="nodeNameLinkPicker"/>
</umb-control-group>