summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorTeemu Pöntelin <tehapo@gmail.com>2016-04-03 23:22:48 +0300
committerVaadin Code Review <review@vaadin.com>2016-04-11 13:16:59 +0000
commit9b46608f6c645c4289b854e2949bae3b1a2f5147 (patch)
treeb900ab05e67e49c10536eb037ecfdc843a30088b /server
parent306f2935bf269538b730a8fc33433a2d3945cad5 (diff)
downloadvaadin-framework-9b46608f6c645c4289b854e2949bae3b1a2f5147.tar.gz
vaadin-framework-9b46608f6c645c4289b854e2949bae3b1a2f5147.zip
Prevent closing of uncloseable Window on esc (#19700)
Change-Id: I4d67cd84c6f4179da6d6fea6b881e8ccd65e70d9
Diffstat (limited to 'server')
-rw-r--r--server/src/com/vaadin/ui/Window.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/server/src/com/vaadin/ui/Window.java b/server/src/com/vaadin/ui/Window.java
index b5cd384f53..70399ae566 100644
--- a/server/src/com/vaadin/ui/Window.java
+++ b/server/src/com/vaadin/ui/Window.java
@@ -1051,7 +1051,9 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
@Override
public void handleAction(Object sender, Object target) {
- window.close();
+ if (window.isClosable()) {
+ window.close();
+ }
}
public boolean equals(int keyCode, int... modifiers) {