]> source.dussan.org Git - vaadin-framework.git/commitdiff
Don't autoclose PopupView when changing fragment, fixes #10530
authorMarc Englund <marc@vaadin.com>
Tue, 21 May 2013 08:39:09 +0000 (11:39 +0300)
committerVaadin Code Review <review@vaadin.com>
Tue, 21 May 2013 09:03:31 +0000 (09:03 +0000)
Change-Id: I83607c97db8499c5e3c76e6d4735a93b0754d580
Ticket: 10530

client/src/com/vaadin/client/ui/VPopupView.java
uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragment.html [new file with mode: 0644]
uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragment.java [new file with mode: 0644]

index d983da2b621ae6c525d71c37aa0d32f746d99555..737dc0496865bc7e28adeda14641bff65e929f62 100644 (file)
@@ -102,6 +102,8 @@ public class VPopupView extends HTML implements Iterable<Widget> {
         });
 
         popup.setAnimationEnabled(true);
+
+        popup.setAutoHideOnHistoryEventsEnabled(false);
     }
 
     /** For internal use only. May be removed or replaced in the future. */
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragment.html b/uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragment.html
new file mode 100644 (file)
index 0000000..28af578
--- /dev/null
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:8888/" />
+<title>PopupViewAndFragment</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">PopupViewAndFragment</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/run/PopupViewAndFragment?restartApplication#</td>
+       <td></td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>vaadin=runPopupViewAndFragment::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragment.java b/uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragment.java
new file mode 100644 (file)
index 0000000..1606b78
--- /dev/null
@@ -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.popupview;
+
+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.PopupView;
+
+public class PopupViewAndFragment extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        final PopupView pw = new PopupView("Open", new Label("Oh, hi"));
+        addComponent(pw);
+
+        final Button button = new Button("Open and change fragment",
+                new Button.ClickListener() {
+                    @Override
+                    public void buttonClick(final ClickEvent event) {
+                        pw.setPopupVisible(true);
+                        getPage().setUriFragment(
+                                String.valueOf(System.currentTimeMillis()));
+                    }
+                });
+        addComponent(button);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Changing frament should not automatically close PopupView";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 10530;
+    }
+
+}