From 8b6fbee47e5e5a3a18ea84b68c0421a61676197d Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Mon, 22 Apr 2019 10:00:51 +0200 Subject: [PATCH] V8: Add back button to listviews in media (#5116) --- src/Umbraco.Web.UI.Client/src/views/media/edit.html | 4 +++- .../src/views/media/media.edit.controller.js | 13 ++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/media/edit.html b/src/Umbraco.Web.UI.Client/src/views/media/edit.html index 987cd91ffc..cb620675a5 100644 --- a/src/Umbraco.Web.UI.Client/src/views/media/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/media/edit.html @@ -14,7 +14,9 @@ hide-description="true" hide-alias="true" navigation="content.apps" - on-select-navigation-item="appChanged(item)"> + on-select-navigation-item="appChanged(item)" + show-back-button="showBack()" + on-back="onBack()"> diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js index 8dda2d6669..d4d538b82c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js @@ -9,7 +9,7 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource, entityResource, navigationService, notificationsService, localizationService, serverValidationManager, contentEditingHelper, fileManager, formHelper, - editorState, umbRequestHelper, $http, eventsService) { + editorState, umbRequestHelper, $http, eventsService, $location) { var evts = []; var nodeId = null; @@ -279,6 +279,17 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource, } } + $scope.showBack = function () { + return !infiniteMode && !!$scope.page.listViewPath; + } + + /** Callback for when user clicks the back-icon */ + $scope.onBack = function() { + if ($scope.page.listViewPath) { + $location.path($scope.page.listViewPath); + } + }; + //ensure to unregister from all events! $scope.$on('$destroy', function () { for (var e in evts) {