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

WIP on media upload tree refresh

Browse Source
This commit is contained in:
perploug
2013-12-05 15:28:32 +01:00
parent 66383c6f16
commit 82ec2d28ef
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
View File

@@ -21,7 +21,7 @@ function startupLatestEditsController($scope) {
}
angular.module("umbraco").controller("Umbraco.Dashboard.StartupLatestEditsController", startupLatestEditsController);
function MediaFolderBrowserDashboardController($rootScope, $scope, assetsService, $routeParams, $timeout, $element, $location, umbRequestHelper, mediaResource, $cookies) {
function MediaFolderBrowserDashboardController($rootScope, $scope, assetsService, $routeParams, $timeout, $element, $location, umbRequestHelper,navigationService, mediaResource, $cookies) {
var dialogOptions = $scope.$parent.dialogOptions;
$scope.filesUploading = [];
@@ -50,9 +50,7 @@ function MediaFolderBrowserDashboardController($rootScope, $scope, assetsService
$scope.loadChildren($scope.options.formData.currentFolder);
$scope.queue = [];
$scope.filesUploading = [];
var path = ["-1"];
navigationService.syncTree({ tree: "media", path: path });
navigationService.reloadSection("media");
});
$scope.$on('fileuploadprocessalways', function(e,data) {

11
src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js
View File

@@ -11,7 +11,7 @@ angular.module("umbraco")
};
})
.controller("Umbraco.PropertyEditors.FolderBrowserController",
function ($rootScope, $scope, assetsService, $routeParams, $timeout, $element, $location, umbRequestHelper, mediaResource, imageHelper, navigationService, editorState) {
function ($rootScope, $scope, assetsService, $routeParams, $timeout, $element, $location, $log, umbRequestHelper, mediaResource, imageHelper, navigationService, editorState) {
var dialogOptions = $scope.$parent.dialogOptions;
$scope.creating = $routeParams.create;
@@ -37,6 +37,11 @@ angular.module("umbraco")
mediaResource.getChildren(id)
.then(function(data) {
$scope.images = data.items;
var path = editorState.current.path;
navigationService.syncTree({ tree: "media", path: path, forceReload: true }).then(function (syncArgs) {
$log.log(syncArgs.node);
});
});
};
@@ -44,10 +49,6 @@ angular.module("umbraco")
$scope.loadChildren($scope.options.formData.currentFolder);
$scope.queue = [];
$scope.filesUploading = [];
var path = editorState.current.path;
alert(path);
navigationService.syncTree({ tree: "media", path: path });
});
$scope.$on('fileuploadprocessalways', function(e,data) {