From 2b4c35bcd8f66f5eadacaed8fc8ca9c3d4dafa17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 24 Oct 2019 13:30:56 +0200
Subject: [PATCH] Better label for copying all entries of nested content

---
 .../property/property-actions/umb-property-actions.html      | 4 ++--
 .../property-actions/umbpropertyactions.component.js         | 5 ++---
 .../nestedcontent/nestedcontent.controller.js                | 1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml                | 1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml                | 1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml             | 1 +
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/property/property-actions/umb-property-actions.html b/src/Umbraco.Web.UI.Client/src/views/components/property/property-actions/umb-property-actions.html
index 1492cbd820..f0eb446f1c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/property/property-actions/umb-property-actions.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/property/property-actions/umb-property-actions.html
@@ -3,9 +3,9 @@
 
     <ul class="umb-actions dropdown-menu" role="menu" on-outside-click="vm.close()" ng-if="vm.isOpen" on-close="vm.close()" deep-blur="vm.close()">
         <li role="menuitem" lass="umb-action" ng-class="{'sep':action.separatorm, '-opens-dialog': action.opensDialog}" ng-repeat="action in vm.actions">
-            <button type="button" ng-click="action.method($event)">
+            <button type="button" ng-click="vm.executeAction(action)">
                 <i class="icon icon-{{action.icon}}" aria-hidden="true"></i>
-                <span class="menu-label"><localize key="{{::action.labelKey}}"></localize></span>
+                <span class="menu-label"><localize key="{{::action.labelKey}}" tokens={{action.labelTokens}}></localize></span>
             </button>
         </li>
     </ul>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/property/property-actions/umbpropertyactions.component.js b/src/Umbraco.Web.UI.Client/src/views/components/property/property-actions/umbpropertyactions.component.js
index 7aad8f5361..b0dc15d6cd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/property/property-actions/umbpropertyactions.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/components/property/property-actions/umbpropertyactions.component.js
@@ -12,9 +12,7 @@
         vm.isOpen = false;
 
         function initDropDown() {
-            keyboardService.bind("esc", function() {
-                navigationService.hideNavigation();
-            });
+            keyboardService.bind("esc", vm.close);
         }
         function destroyDropDown() {
             keyboardService.unbind("esc");
@@ -38,6 +36,7 @@
 
         vm.executeAction = function(action) {
             action.method();
+            vm.close();
         }
 
         vm.$onDestroy = function () {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 1e571fb48b..9d686beac3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -623,6 +623,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
         $scope.propertyActions = [
             {
                 labelKey: 'actions_copy',
+                labelTokens: [$scope.model.label],
                 icon: 'documents',
                 method: copyAllEntries
             }
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 677de9dfd1..eb1a514170 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -1731,6 +1731,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="usedByProperties">Brugt af</key>
   </area>
   <area alias="clipboard">
+    <key alias="labelForCopyAllEntries">Kopier %0%</key>
     <key alias="labelForArrayOfItemsFrom">%0% fra %1%</key>
   </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index 0ee1578f6f..ded758b320 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -2168,6 +2168,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="usedByProperties">Used by</key>
   </area>
   <area alias="clipboard">
+    <key alias="labelForCopyAllEntries">Copy %0%</key>
     <key alias="labelForArrayOfItemsFrom">%0% from %1%</key>
   </area>
 </language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index baf765dc73..04a19cb862 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -2184,6 +2184,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="usedByProperties">Used by</key>
   </area>
   <area alias="clipboard">
+    <key alias="labelForCopyAllEntries">Copy %0%</key>
     <key alias="labelForArrayOfItemsFrom">%0% from %1%</key>
   </area>
 </language>