diff options
| author | Artur Signell <artur@vaadin.com> | 2012-11-14 13:25:31 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-11-14 13:25:31 +0000 |
| commit | 2efb8f3753808c8b35dacde0d731e82b9c752359 (patch) | |
| tree | deecf2ea920c39fc4a68f24e4871100c1de75f54 | |
| parent | 251e140917efc4e63826d8800b1dda1694f89fea (diff) | |
| parent | 770a1b8b4f3a6254a5e43d9446381d6e31ee402d (diff) | |
| download | vaadin-framework-2efb8f3753808c8b35dacde0d731e82b9c752359.tar.gz vaadin-framework-2efb8f3753808c8b35dacde0d731e82b9c752359.zip | |
Merge "Made PopupView work with TB again and fixed test (#10187)"
| -rw-r--r-- | client/src/com/vaadin/client/ui/VPopupView.java | 7 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/client/src/com/vaadin/client/ui/VPopupView.java b/client/src/com/vaadin/client/ui/VPopupView.java index 4e0a9bcf98..129e233d5e 100644 --- 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 c52bfa634d..7f787017a0 100644 --- 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> |