/*
* Stores the element that has focus in the application UI when the
* window is opened, so it can be restored when the window closes.
- *
+ *
* This is currently implemented for the case when one non-modal window
* can be open at the same time, and the focus is not changed while the
* window is open.
/*
* Restores the previously stored focused element.
- *
+ *
* When the focus was changed outside the window while the window was
* open, the originally stored element is restored.
*/
* correctly if clicking on the "close" button in the window header but
* closing the window from a button for example in the window will fail.
* Symptom described in #10776
- *
+ *
* The problematic part is that for the focus to be returned correctly
* an input element needs to be focused in the root panel. Focusing some
* other element apparently won't work.
* WAI-ARIA role to set for the window
*/
public void setWaiAriaRole(WindowRole role) {
- if ("alertdialog".equals(role)) {
+ if (role == WindowRole.ALERTDIALOG) {
Roles.getAlertdialogRole().set(getElement());
} else {
Roles.getDialogRole().set(getElement());
--- /dev/null
+/*
+ * Copyright 2000-2014 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.accessibility;
+
+import java.util.Stack;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.window.WindowRole;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Window;
+
+/**
+ * UI to test if subwindows get the correct assistive roles.
+ *
+ * @author Vaadin Ltd
+ */
+public class WindowWaiAriaRoles extends AbstractTestUI {
+ Stack<Window> windows = new Stack<Window>();
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
+ * VaadinRequest)
+ */
+ @Override
+ protected void setup(VaadinRequest request) {
+ Button closeButton = new Button("Close windows");
+ closeButton.addClickListener(new ClickListener() {
+
+ @Override
+ public void buttonClick(ClickEvent event) {
+ while (!windows.isEmpty()) {
+ Window window = windows.pop();
+ removeWindow(window);
+ }
+ }
+
+ });
+
+ Button regularButton = new Button("Regular");
+ regularButton.addClickListener(new ClickListener() {
+
+ @Override
+ public void buttonClick(ClickEvent event) {
+ Window regularWindow = new Window("Regular window");
+ openWindow(regularWindow);
+ }
+ });
+
+ Button alertButton = new Button("Alert");
+ alertButton.addClickListener(new ClickListener() {
+ @Override
+ public void buttonClick(ClickEvent event) {
+ Window alertWindow = new Window("Alert window");
+ alertWindow.setAssistiveRole(WindowRole.ALERTDIALOG);
+ openWindow(alertWindow);
+ }
+ });
+ addComponent(closeButton);
+ addComponent(regularButton);
+ addComponent(alertButton);
+ }
+
+ void openWindow(Window window) {
+ windows.push(window);
+ window.center();
+ addWindow(window);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
+ */
+ @Override
+ protected String getTestDescription() {
+ return "The alert window should have the role 'alertdialog' and the regular window should have the role 'dialog'";
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
+ */
+ @Override
+ protected Integer getTicketNumber() {
+ return 14289;
+ }
+
+}
--- /dev/null
+/*
+ * Copyright 2000-2014 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.accessibility;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.WindowElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+/**
+ * Test to see if regular and alert windows get the correct wai-aria roles
+ *
+ * @author Vaadin Ltd
+ */
+public class WindowWaiAriaRolesTest extends MultiBrowserTest {
+
+ @Test
+ public void testRegularWindowRole() {
+ openTestURL();
+
+ $(ButtonElement.class).caption("Regular").first().click();
+ String role = getWindowRole();
+ Assert.assertTrue("Dialog has incorrect role '" + role
+ + "', expected 'dialog'", "dialog".equals(role));
+ }
+
+ @Test
+ public void testAlertWindowRole() {
+ openTestURL();
+ $(ButtonElement.class).caption("Alert").first().click();
+ String role = getWindowRole();
+ Assert.assertTrue("Dialog has incorrect role '" + role
+ + "', expected 'alertdialog'", "alertdialog".equals(role));
+ }
+
+ public String getWindowRole() {
+ return $(WindowElement.class).first().getAttribute("role");
+ }
+}
projects / vaadin-framework.git / commitdiff