use infinite media picker in link picker

This commit is contained in:
Mads Rasmussen
2018-08-21 14:54:11 +02:00
parent 892a88179e
commit c81ce94f1f
2 changed files with 7 additions and 15 deletions

View File

@@ -1,6 +1,6 @@
//used for the media picker dialog
angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
function ($scope, eventsService, entityResource, contentResource, mediaHelper, userService, localizationService, tinyMceService) {
function ($scope, eventsService, entityResource, contentResource, mediaHelper, userService, localizationService, tinyMceService, editorService) {
var vm = this;
var dialogOptions = $scope.model;
@@ -108,11 +108,9 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
$scope.switchToMediaPicker = function () {
userService.getCurrentUser().then(function (userData) {
$scope.mediaPickerOverlay = {
view: "mediapicker",
var mediaPicker = {
startNodeId: userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0],
startNodeIsVirtual: userData.startMediaIds.length !== 1,
show: true,
submit: function (model) {
var media = model.selectedImages[0];
@@ -122,12 +120,13 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
$scope.model.target.name = media.name;
$scope.model.target.url = mediaHelper.resolveFile(media);
debugger;
$scope.mediaPickerOverlay.show = false;
$scope.mediaPickerOverlay = null;
editorService.close();
},
close: function() {
editorService.close();
}
};
editorService.mediaPicker(mediaPicker);
});
};

View File

@@ -109,13 +109,6 @@
<localize key="defaultdialogs_selectMedia">Select media</localize>
</a>
</div>
<umb-overlay
ng-if="mediaPickerOverlay.show"
model="mediaPickerOverlay"
view="mediaPickerOverlay.view"
position="right">
</umb-overlay>
</umb-box-content>
</umb-box>