]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2374a69)
Made PopupView work with TB again and fixed test (#10187) 56/256/3
authorArtur Signell <artur@vaadin.com>
Tue, 13 Nov 2012 14:21:56 +0000 (16:21 +0200)
committerArtur Signell <artur@vaadin.com>
Wed, 14 Nov 2012 13:25:12 +0000 (15:25 +0200)
Change-Id: I36b568866a69354caa36609fc7c7d42082bc9489

client/src/com/vaadin/client/ui/VPopupView.java patch | blob | history
uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html patch | blob | history

diff --git a/client/src/com/vaadin/client/ui/VPopupView.java b/client/src/com/vaadin/client/ui/VPopupView.java
index 4e0a9bcf982f3b12e62bee27b89c8ca227e0ce94..129e233d5e9e507a8c2fa0d6a68164a1190edfde 100644 (file)
--- a/client/src/com/vaadin/client/ui/VPopupView.java
+++ b/client/src/com/vaadin/client/ui/VPopupView.java
@@ -15,6 +15,7 @@
  */
 package com.vaadin.client.ui;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
@@ -45,7 +46,7 @@ import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
 import com.vaadin.client.ui.popupview.VisibilityChangeEvent;
 import com.vaadin.client.ui.popupview.VisibilityChangeHandler;
 
-public class VPopupView extends HTML {
+public class VPopupView extends HTML implements Iterable<Widget> {
 
     public static final String CLASSNAME = "v-popupview";
 
@@ -390,4 +391,8 @@ public class VPopupView extends HTML {
                 VisibilityChangeEvent.getType());
     }
 
+    public Iterator<Widget> iterator() {
+        return Collections.singleton((Widget) popup).iterator();
+    }
+
 }// class VPopupView
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html b/uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html
index c52bfa634d8f03e89692e87cef527ae279e0815b..7f787017a00b5a9fc5b9caa3f669a156b7fcaa23 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html
@@ -3,7 +3,7 @@
 <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:8068/" />
+<link rel="selenium.base" href="http://localhost:8888/" />
 <title>PopupViewClickShortcut</title>
 </head>
 <body>
@@ -93,12 +93,12 @@
 </tr>
 <tr>
        <td>pressSpecialKey</td>
-       <td>vaadin=runcomvaadintestscomponentspopupviewPopupViewClickShortcut::/VWindow[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentspopupviewPopupViewClickShortcut::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[2]</td>
        <td>ctrl alt U</td>
 </tr>
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentspopupviewPopupViewClickShortcut::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[2]/VPopupView[0]/VPopupView$CustomPopup[0]/VCaptionWrapper[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[5]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentspopupviewPopupViewClickShortcut::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[2]/VPopupView[0]/VPopupView$CustomPopup[0]/VCaptionWrapper[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[5]/domChild[0]</td>
        <td>132,11</td>
 </tr>
 <tr>
@@ -123,7 +123,7 @@
 </tr>
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentspopupviewPopupViewClickShortcut::/VVerticalLayout[0]/domChild[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentspopupviewPopupViewClickShortcut::/VVerticalLayout[0]/domChild[0]</td>
        <td>279,482</td>
 </tr>
 <tr>
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework