summaryrefslogtreecommitdiffstats
path: root/src/com/vaadin/ui
diff options
context:
space:
mode:
authorAutomerge <automerge@vaadin.com>2012-05-21 13:19:35 +0000
committerAutomerge <automerge@vaadin.com>2012-05-21 13:19:35 +0000
commit9b52497261f0063b5a2d0431b8d7d61930a46161 (patch)
tree2923f4b1b10c85776df33ff3f1b2f1c76ad9fe74 /src/com/vaadin/ui
parent879e9aef4d6374ce89565460e0a979731f5da71f (diff)
downloadvaadin-framework-9b52497261f0063b5a2d0431b8d7d61930a46161.tar.gz
vaadin-framework-9b52497261f0063b5a2d0431b8d7d61930a46161.zip
[merge from 6.7] Don't trigger actions if space or enter is pressed with Button focused (#7191)
svn changeset:23774/svn branch:6.8
Diffstat (limited to 'src/com/vaadin/ui')
-rw-r--r--src/com/vaadin/ui/Button.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java
index fdaef046e5..0032db1752 100644
--- a/src/com/vaadin/ui/Button.java
+++ b/src/com/vaadin/ui/Button.java
@@ -158,9 +158,6 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
if (isDisableOnClick()) {
target.addAttribute(VButton.ATTR_DISABLE_ON_CLICK, true);
}
- if (clickShortcut != null) {
- target.addAttribute("keycode", clickShortcut.getKeyCode());
- }
if (isHtmlContentAllowed()) {
target.addAttribute("html-caption", true);