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

V8: Fix the media picker folder creation and "sub folders" toggle button (#3630)

Browse Source
This commit is contained in:
Kenn Jacobsen
2018-12-09 14:17:57 +01:00
committed by Sebastiaan Janssen
parent 0c9ecacca0
commit 14fd9c835d
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,9 +4,12 @@ angular.module("umbraco")
function($scope, mediaResource, entityResource, mediaHelper, mediaTypeHelper, eventsService, treeService, localStorageService, localizationService, editorService) {
if (!$scope.model.title) {
localizationService.localize("defaultdialogs_selectMedia")
.then(function(data){
$scope.model.title = data;
localizationService.localizeMany(["defaultdialogs_selectMedia", "general_includeFromsubFolders"])
.then(function (data) {
$scope.labels = {
title: data[0],
includeSubFolders: data[1]
}
});
}
@@ -113,10 +116,10 @@ angular.module("umbraco")
};
$scope.submitFolder = function() {
if ($scope.newFolderName) {
if ($scope.model.newFolderName) {
$scope.creatingFolder = true;
mediaResource
.addFolder($scope.newFolderName, $scope.currentFolder.id)
.addFolder($scope.model.newFolderName, $scope.currentFolder.id)
.then(function(data) {
//we've added a new folder so lets clear the tree cache for that specific item
treeService.clearCache({
@@ -126,7 +129,7 @@ angular.module("umbraco")
$scope.creatingFolder = false;
$scope.gotoFolder(data);
$scope.showFolderInput = false;
$scope.newFolderName = "";
$scope.model.newFolderName = "";
});
} else {
$scope.showFolderInput = false;

2
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
View File

@@ -68,7 +68,7 @@
<i class="icon icon-add small"></i>
</a>
<input type="text" class="umb-breadcrumbs__add-ancestor" ng-show="showFolderInput" ng-model="newFolderName" ng-keydown="enterSubmitFolder($event)"
<input type="text" class="umb-breadcrumbs__add-ancestor" ng-show="showFolderInput" ng-model="model.newFolderName" ng-keydown="enterSubmitFolder($event)"
on-blur="submitFolder()" focus-when="{{showFolderInput}}" />
</li>
</ul>