From b9d1df0844eca118a8de51c070b77b471b84b24e Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Sun, 24 Feb 2019 15:28:04 +0100 Subject: [PATCH 1/9] Return folder creation to non-active state in media picker --- .../infiniteeditors/mediapicker/mediapicker.controller.js | 8 ++++---- .../common/infiniteeditors/mediapicker/mediapicker.html | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js index 2d6a2be471..76cd816f14 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js @@ -117,7 +117,7 @@ angular.module("umbraco") $scope.submitFolder = function() { if ($scope.model.newFolderName) { - $scope.creatingFolder = true; + $scope.model.creatingFolder = true; mediaResource .addFolder($scope.model.newFolderName, $scope.currentFolder.id) .then(function(data) { @@ -126,13 +126,13 @@ angular.module("umbraco") cacheKey: "__media", //this is the main media tree cache key childrenOf: data.parentId //clear the children of the parent }); - $scope.creatingFolder = false; + $scope.model.creatingFolder = false; $scope.gotoFolder(data); - $scope.showFolderInput = false; + $scope.model.showFolderInput = false; $scope.model.newFolderName = ""; }); } else { - $scope.showFolderInput = false; + $scope.model.showFolderInput = false; } }; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html index da88b9321e..6eee269cee 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html @@ -64,15 +64,15 @@
  • - + - +
    • -
    +
    Date: Sat, 20 Apr 2019 20:05:18 +0100 Subject: [PATCH 2/9] feat: add a 'tabbing-active' class when a person starts tabbing --- .../src/controllers/main.controller.js | 13 +++++++++++++ src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js b/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js index c2b2ba26d7..3ca5cd2b2c 100644 --- a/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js +++ b/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js @@ -18,7 +18,20 @@ function MainController($scope, $location, appState, treeService, notificationsS $scope.drawer = {}; $scope.search = {}; $scope.login = {}; + $scope.tabbingActive = false; + // There are a number of ways to detect when a focus state should be shown when using the tab key and this seems to be the simplest solution. + // For more information about this approach, see https://hackernoon.com/removing-that-ugly-focus-ring-and-keeping-it-too-6c8727fefcd2 + function handleFirstTab(evt) { + if (evt.keyCode === 9) { + $scope.tabbingActive = true; + window.removeEventListener('keydown', handleFirstTab); + } + } + + window.addEventListener("keydown", handleFirstTab); + + $scope.removeNotification = function (index) { notificationsService.remove(index); }; diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml index 790a62f271..3574d5d175 100644 --- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml +++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml @@ -43,7 +43,7 @@ @Html.RenderCssHere( new BasicPath("Umbraco", IOHelper.ResolveUrl(SystemDirectories.Umbraco))) - +