From 82ec2d28ef164a0bebe2db74163c7ed2aaedc73b Mon Sep 17 00:00:00 2001 From: perploug Date: Thu, 5 Dec 2013 15:28:32 +0100 Subject: [PATCH] WIP on media upload tree refresh --- .../src/views/dashboard/dashboard.tabs.controller.js | 6 ++---- .../folderbrowser/folderbrowser.controller.js | 11 ++++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js index ce5cbc75ea..9d346eeb9a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js @@ -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) { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js index 6f4861ee5c..e3689250d9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js @@ -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) {