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

Automatically select uploaded media in media pickers

Browse Source
This commit is contained in:
Kenn Jacobsen
2019-10-30 21:04:13 +01:00
committed by emma burstow
parent 00364bcdf0
commit a5c0965e02
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
View File

@@ -1,7 +1,7 @@
//used for the media picker dialog
angular.module("umbraco")
.controller("Umbraco.Editors.MediaPickerController",
function ($scope, mediaResource, entityResource, userService, mediaHelper, mediaTypeHelper, eventsService, treeService, localStorageService, localizationService, editorService) {
function ($scope, $timeout, mediaResource, entityResource, userService, mediaHelper, mediaTypeHelper, eventsService, treeService, localStorageService, localizationService, editorService) {
var vm = this;
@@ -292,13 +292,20 @@ angular.module("umbraco")
function onUploadComplete(files) {
gotoFolder($scope.currentFolder).then(function () {
if (files.length === 1 && $scope.model.selection.length === 0) {
var image = $scope.images[$scope.images.length - 1];
$scope.target = image;
$scope.target.url = mediaHelper.resolveFile(image);
selectMedia(image);
}
})
$timeout(function () {
if ($scope.multiPicker) {
var images = _.rest($scope.images, $scope.images.length - files.length);
_.each(images, function(image) {
selectMedia(image);
});
} else {
var image = $scope.images[$scope.images.length - 1];
$scope.target = image;
$scope.target.url = mediaHelper.resolveFile(image);
selectMedia(image);
}
});
});
}
function onFilesQueue() {