diff options
author | Felype Santiago Ferreira <felype@vaadin.com> | 2014-01-28 15:36:19 +0200 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2014-03-24 19:25:13 +0200 |
commit | d5ce54586a445550b3df5168fe83accb3945901e (patch) | |
tree | d69dcda80f85c9cb0ebea3b4d6031e00ab73cf2a | |
parent | 43b8ca588189e3fddf69020e46ada4c3ad170e9f (diff) | |
download | vaadin-framework-d5ce54586a445550b3df5168fe83accb3945901e.tar.gz vaadin-framework-d5ce54586a445550b3df5168fe83accb3945901e.zip |
Ignore backspace events in modal windows (#13180)
Change-Id: Idf3ec4bc80bd015c546000e99cb6ff16e79ca5a8
3 files changed, 179 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/ui/VWindow.java b/client/src/com/vaadin/client/ui/VWindow.java index ad9d0eac7e..f83bc83c8d 100644 --- a/client/src/com/vaadin/client/ui/VWindow.java +++ b/client/src/com/vaadin/client/ui/VWindow.java @@ -30,6 +30,7 @@ import com.google.gwt.event.dom.client.BlurEvent; import com.google.gwt.event.dom.client.BlurHandler; import com.google.gwt.event.dom.client.FocusEvent; import com.google.gwt.event.dom.client.FocusHandler; +import com.google.gwt.event.dom.client.KeyCodes; import com.google.gwt.event.dom.client.KeyDownEvent; import com.google.gwt.event.dom.client.KeyDownHandler; import com.google.gwt.event.dom.client.ScrollEvent; @@ -144,6 +145,8 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, private boolean closable = true; + private boolean hasFocus; + /** * If centered (via UIDL), the window should stay in the centered -mode * until a position is received from the server, or the user moves or @@ -1048,6 +1051,10 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, @Override public void onKeyDown(KeyDownEvent event) { + if (hasFocus && event.getNativeKeyCode() == KeyCodes.KEY_BACKSPACE) { + event.preventDefault(); + } + if (shortcutHandler != null) { shortcutHandler .handleKeyboardEvent(Event.as(event.getNativeEvent())); @@ -1057,6 +1064,8 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, @Override public void onBlur(BlurEvent event) { + hasFocus = false; + if (client.hasEventListeners(this, EventId.BLUR)) { client.updateVariable(id, EventId.BLUR, "", true); } @@ -1064,6 +1073,8 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, @Override public void onFocus(FocusEvent event) { + hasFocus = true; + if (client.hasEventListeners(this, EventId.FOCUS)) { client.updateVariable(id, EventId.FOCUS, "", true); } diff --git a/uitest/src/com/vaadin/tests/components/window/BackspaceKeyWithModalOpened.java b/uitest/src/com/vaadin/tests/components/window/BackspaceKeyWithModalOpened.java new file mode 100644 index 0000000000..b568b4d46a --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/window/BackspaceKeyWithModalOpened.java @@ -0,0 +1,114 @@ +/* + * Copyright 2000-2013 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.components.window; + +import com.vaadin.navigator.Navigator; +import com.vaadin.navigator.View; +import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Label; +import com.vaadin.ui.Layout; +import com.vaadin.ui.TextField; +import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.Window; + +public class BackspaceKeyWithModalOpened extends AbstractTestUI { + + private static final String DEFAULT_VIEW_ID = ""; + private static final String SECOND_VIEW_ID = "second"; + + public static final String BTN_NEXT_ID = "btn_next"; + public static final String BTN_OPEN_MODAL_ID = "btn_open_modal"; + public static final String TEXT_FIELD_IN_MODAL = "txt_in_modal"; + + private Navigator navigator; + + class DefaultView extends Label implements View { + + @Override + public void enter(ViewChangeEvent event) { + Button btnNext = new Button("Next", new Button.ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + navigator.navigateTo(SECOND_VIEW_ID); + } + }); + + btnNext.setId(BTN_NEXT_ID); + addComponent(btnNext); + } + } + + class SecondView extends Label implements View { + + @Override + public void enter(ViewChangeEvent event) { + Button btnOpenModal = new Button("Open modal", + new Button.ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + Window window = new Window("Caption"); + + VerticalLayout layout = new VerticalLayout(); + layout.setWidth("300px"); + layout.setHeight("300px"); + + TextField textField = new TextField(); + textField.setId(TEXT_FIELD_IN_MODAL); + + layout.addComponent(textField); + window.setContent(layout); + + addWindow(window); + + window.setModal(true); + + setFocusedComponent(window); + } + }); + + btnOpenModal.setId(BTN_OPEN_MODAL_ID); + addComponent(btnOpenModal); + } + } + + @Override + protected void setup(VaadinRequest request) { + Layout navigatorLayout = new VerticalLayout(); + navigator = new Navigator(this, navigatorLayout); + + addComponent(navigatorLayout); + + navigator.addView(DEFAULT_VIEW_ID, new DefaultView()); + + navigator.addView(SECOND_VIEW_ID, new SecondView()); + } + + @Override + protected String getTestDescription() { + return "Navigator should not go back with modal opened."; + } + + @Override + protected Integer getTicketNumber() { + return 13180; + } +} diff --git a/uitest/src/com/vaadin/tests/components/window/BackspaceKeyWithModalOpenedTest.java b/uitest/src/com/vaadin/tests/components/window/BackspaceKeyWithModalOpenedTest.java new file mode 100644 index 0000000000..8104640987 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/window/BackspaceKeyWithModalOpenedTest.java @@ -0,0 +1,54 @@ +/* + * Copyright 2000-2013 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.components.window; + +import org.junit.Test; +import org.openqa.selenium.Keys; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.interactions.Actions; + +import com.vaadin.testbench.By; +import com.vaadin.tests.tb3.MultiBrowserTest; + +public class BackspaceKeyWithModalOpenedTest extends MultiBrowserTest { + + @Test + public void testWindowScrollbars() throws Exception { + openTestURL(); + + WebElement nextButton = driver.findElement(By + .id(BackspaceKeyWithModalOpened.BTN_NEXT_ID)); + + nextButton.click(); + + WebElement openModalButton = driver.findElement(By + .id(BackspaceKeyWithModalOpened.BTN_OPEN_MODAL_ID)); + + openModalButton.click(); + + // Try to send back actions to the browser. + new Actions(getDriver()).sendKeys(Keys.BACK_SPACE).perform(); + + WebElement textField = driver.findElement(By + .id(BackspaceKeyWithModalOpened.TEXT_FIELD_IN_MODAL)); + + // Try to delete characters in a text field. + textField.sendKeys("textt"); + textField.sendKeys(Keys.BACK_SPACE); + + compareScreen(getScreenshotBaseName()); + } +} |