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

Gets the multi url picker working with ignore start nodes

Browse Source
This commit is contained in:
Shannon
2019-07-01 21:13:11 +10:00
parent 503183331f
commit 0a6237af04
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
View File

@@ -1170,14 +1170,15 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
//Create the insert media plugin
self.createMediaPicker(args.editor, function (currentTarget, userData) {
var startNodeId, startNodeIsVirtual;
if (!args.model.config.startNodeId) {
if (args.model.config.ignoreUserStartNodes === true) {
args.model.config.startNodeId = -1;
args.model.config.startNodeIsVirtual = true;
startNodeId = -1;
startNodeIsVirtual = true;
}
else {
args.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
args.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
startNodeIsVirtual = userData.startMediaIds.length !== 1;
}
}
@@ -1186,8 +1187,8 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
onlyImages: true,
showDetails: true,
disableFolderSelect: true,
startNodeId: args.model.config.startNodeId,
startNodeIsVirtual: args.model.config.startNodeIsVirtual,
startNodeId: startNodeId,
startNodeIsVirtual: startNodeIsVirtual,
dataTypeId: args.model.dataTypeId,
submit: function (model) {
self.insertMediaInEditor(args.editor, model.selection[0]);

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

@@ -161,9 +161,21 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
$scope.switchToMediaPicker = function () {
userService.getCurrentUser().then(function (userData) {
var startNodeId, startNodeIsVirtual;
if (dialogOptions.ignoreUserStartNodes === true) {
startNodeId = -1;
startNodeIsVirtual = true;
}
else {
startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
startNodeIsVirtual = userData.startMediaIds.length !== 1;
}
var mediaPicker = {
startNodeId: userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0],
startNodeIsVirtual: userData.startMediaIds.length !== 1,
startNodeId: startNodeId,
startNodeIsVirtual: startNodeIsVirtual,
dataTypeId: dialogOptions.dataTypeId,
submit: function (model) {
var media = model.selection[0];