From 9f90c99350a1a97d76c021ff4a1595e17c1d18af Mon Sep 17 00:00:00 2001 From: Nathan Woulfe Date: Sun, 17 Jun 2018 19:46:07 +1000 Subject: [PATCH] fetch anchors for existing links --- .../views/common/dialogs/linkpicker.controller.js | 6 ++++-- .../overlays/linkpicker/linkpicker.controller.js | 12 ++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js index ba6835a6b1..043d5af1c5 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js @@ -34,8 +34,10 @@ angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController", }); } - contentResource.getNiceUrl(id).then(function (url) { - $scope.target.url = url; + // if a link exists, get the properties to build the anchor name list + contentResource.getById(id).then(function (resp) { + $scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties)); + $scope.model.target.url = resp.urls[0]; }); } } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js index 5d6b0916f8..a5fa5f5e3e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js @@ -42,14 +42,14 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController", $scope.dialogTreeEventHandler.syncTree({ path: $scope.model.target.path, tree: "content" }); }); } - - contentResource.getNiceUrl(id).then(function (url) { - $scope.model.target.url = url; + + // if a link exists, get the properties to build the anchor name list + contentResource.getById(id).then(function (resp) { + $scope.anchorValues = tinyMceService.getAnchorNames(JSON.stringify(resp.properties)); + $scope.model.target.url = resp.urls[0]; }); } - } - - if (dialogOptions.anchors) { + } else if (dialogOptions.anchors) { $scope.anchorValues = dialogOptions.anchors; }