Fixed #7548 - testbench tests with keyboard navigation now work in ie6

svn changeset:21678/svn branch:6.7

2 files changed, 17 insertions, 0 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java b/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java
index 04fc34b769..5f3e5b18fd 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java
@@ -82,4 +82,11 @@ public class FocusElementPanel extends SimpleFocusablePanel {
             }
         }
     }
+
+    /**
+     * @return the focus element
+     */
+    public Element getFocusElement() {
+        return focusElement.cast();
+    }
 }
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTree.java b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
index fa25279328..f50b722d0c 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTree.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
@@ -2173,6 +2173,12 @@ public class VTree extends FocusElementPanel implements Paintable,
      * .lang.String)
      */
     public Element getSubPartElement(String subPart) {
+        if ("fe".equals(subPart)) {
+            if (isIE6OrOpera() && focusedNode != null) {
+                return focusedNode.getElement();
+            }
+            return getFocusElement();
+        }
 
         if (subPart.startsWith(SUBPART_NODE_PREFIX + "[")) {
             boolean expandCollapse = false;
@@ -2237,6 +2243,10 @@ public class VTree extends FocusElementPanel implements Paintable,
             return null;
         }
 
+        if (subElement == getFocusElement()) {
+            return "fe";
+        }
+
         TreeNode treeNode = Util.findWidget(subElement, TreeNode.class);
         if (treeNode == null) {
             // Did not click on a node, let somebody else take care of the