Revert "Merged shortcut action fix from 6.8 (#8484)"

This reverts commit a003c8724c1f719e3a9f3ab876396a180b19cae1

Change-Id: Ie73b6f0455a9f8ba1ed5a8cee7573ae998a67b17

1 files changed, 4 insertions, 5 deletions

diff --git a/server/src/com/vaadin/ui/Button.java b/server/src/com/vaadin/ui/Button.java
index d581293713..dc3c210899 100644
--- a/server/src/com/vaadin/ui/Button.java
+++ b/server/src/com/vaadin/ui/Button.java
@@ -472,6 +472,7 @@ public class Button extends AbstractComponent implements
      * 
      */
     public static class ClickShortcut extends ShortcutListener {
+        protected Button button;
 
         /**
          * Creates a keyboard shortcut for clicking the given button using the
@@ -484,8 +485,7 @@ public class Button extends AbstractComponent implements
          */
         public ClickShortcut(Button button, String shorthandCaption) {
             super(shorthandCaption);
-            setTarget(button);
-            setTargetAction("click");
+            this.button = button;
         }
 
         /**
@@ -501,8 +501,7 @@ public class Button extends AbstractComponent implements
          */
         public ClickShortcut(Button button, int keyCode, int... modifiers) {
             super(null, keyCode, modifiers);
-            setTarget(button);
-            setTargetAction("click");
+            this.button = button;
         }
 
         /**
@@ -520,7 +519,7 @@ public class Button extends AbstractComponent implements
 
         @Override
         public void handleAction(Object sender, Object target) {
-            // Action handled on the client side
+            button.click();
         }
     }