#6788,#6197 : lifted modifications done in scrolltable to helper class

svn changeset:18294/svn branch:6.5

diff --git a/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java b/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java
index cebdf1063f7b4c37787d7a59fb806328342a1ee6..7bf00eb00c7f71878029de4bae161eb5bfceb002 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java
@@ -1,20 +1,31 @@
 package com.vaadin.terminal.gwt.client.ui;
 
+import com.google.gwt.core.client.Scheduler;
+import com.google.gwt.core.client.Scheduler.ScheduledCommand;
+import com.google.gwt.dom.client.DivElement;
+import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Style;
 import com.google.gwt.dom.client.Style.Overflow;
 import com.google.gwt.dom.client.Style.Position;
+import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.event.dom.client.HasScrollHandlers;
 import com.google.gwt.event.dom.client.ScrollEvent;
 import com.google.gwt.event.dom.client.ScrollHandler;
 import com.google.gwt.event.shared.HandlerRegistration;
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.Element;
+import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.ScrollPanel;
+import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.impl.FocusImpl;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
 
 /**
  * A scrollhandlers similar to {@link ScrollPanel}.
  * 
  */
 public class FocusableScrollPanel extends SimpleFocusablePanel implements
-        HasScrollHandlers {
+        HasScrollHandlers, ScrollHandler {
 
     public FocusableScrollPanel() {
         // Prevent IE standard mode bug when a AbsolutePanel is contained.
@@ -24,6 +35,76 @@ public class FocusableScrollPanel extends SimpleFocusablePanel implements
         style.setPosition(Position.RELATIVE);
     }
 
+    private DivElement focusElement;
+
+    public FocusableScrollPanel(boolean useFakeFocusElement) {
+        this();
+        if (useFakeFocusElement) {
+            focusElement = Document.get().createDivElement();
+        }
+    }
+
+    private boolean useFakeFocusElement() {
+        return focusElement != null;
+    }
+
+    @Override
+    public void setWidget(Widget w) {
+        super.setWidget(w);
+        if (useFakeFocusElement()) {
+            if (focusElement.getParentElement() == null) {
+                Style style = focusElement.getStyle();
+                if (BrowserInfo.get().isIE6()) {
+                    style.setOverflow(Overflow.HIDDEN);
+                    style.setHeight(0, Unit.PX);
+                    style.setWidth(0, Unit.PX);
+                    style.setPosition(Position.ABSOLUTE);
+
+                    addScrollHandler(this);
+                } else {
+                    style.setPosition(Position.FIXED);
+                    style.setTop(0, Unit.PX);
+                    style.setLeft(0, Unit.PX);
+                }
+                getElement().appendChild(focusElement);
+                /* Sink from focusElemet too as focusa and blur don't bubble */
+                DOM.sinkEvents(
+                        (com.google.gwt.user.client.Element) focusElement
+                                .cast(), Event.FOCUSEVENTS);
+                // revert to original, not focusable
+                getElement().setPropertyObject("tabIndex", null);
+
+            }
+        }
+    }
+
+    @Override
+    public void setFocus(boolean focus) {
+        if (useFakeFocusElement()) {
+            if (focus) {
+                FocusImpl.getFocusImplForPanel().focus(
+                        (Element) focusElement.cast());
+            } else {
+                FocusImpl.getFocusImplForPanel().blur(
+                        (Element) focusElement.cast());
+            }
+        } else {
+            super.setFocus(focus);
+        }
+    }
+
+    @Override
+    public void setTabIndex(int tabIndex) {
+        if (useFakeFocusElement()) {
+            getElement().setTabIndex(-1);
+            if (focusElement != null) {
+                focusElement.setTabIndex(tabIndex);
+            }
+        } else {
+            super.setTabIndex(tabIndex);
+        }
+    }
+
     public HandlerRegistration addScrollHandler(ScrollHandler handler) {
         return addDomHandler(handler, ScrollEvent.getType());
     }
@@ -66,4 +147,14 @@ public class FocusableScrollPanel extends SimpleFocusablePanel implements
         getElement().setScrollTop(position);
     }
 
+    public void onScroll(ScrollEvent event) {
+        Scheduler.get().scheduleDeferred(new ScheduledCommand() {
+            public void execute() {
+                focusElement.getStyle().setTop(getScrollPosition(), Unit.PX);
+                focusElement.getStyle().setLeft(getHorizontalScrollPosition(),
+                        Unit.PX);
+            }
+        });
+    }
+
 }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index b29118e244eb46c3b1583d3aae952581cdcc9bf7..8f5ddaae5714c422418671833884cf9ce0b3d2b0 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -16,13 +16,11 @@ import java.util.Set;
 import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.core.client.Scheduler.ScheduledCommand;
-import com.google.gwt.dom.client.DivElement;
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.NativeEvent;
 import com.google.gwt.dom.client.NodeList;
 import com.google.gwt.dom.client.Style;
 import com.google.gwt.dom.client.Style.Display;
-import com.google.gwt.dom.client.Style.Overflow;
 import com.google.gwt.dom.client.Style.Position;
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.dom.client.Style.Visibility;
@@ -53,7 +51,6 @@ import com.google.gwt.user.client.ui.Panel;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.UIObject;
 import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.impl.FocusImpl;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.BrowserInfo;
 import com.vaadin.terminal.gwt.client.Container;
@@ -278,87 +275,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
 
     private final TableFooter tFoot = new TableFooter();
 
-    private final FocusableScrollPanel scrollBodyPanel = new FocusableScrollPanel() {
-
-        private DivElement focusElement = Document.get().createDivElement();
-
-        @Override
-        public void setWidget(Widget w) {
-            super.setWidget(w);
-            if (focusElement.getParentElement() == null) {
-                Style style = focusElement.getStyle();
-                if (BrowserInfo.get().isIE6()) {
-                    style.setOverflow(Overflow.HIDDEN);
-                    style.setHeight(0, Unit.PX);
-                    style.setWidth(0, Unit.PX);
-                    style.setPosition(Position.ABSOLUTE);
-
-                    addScrollHandler(new ScrollHandler() {
-                        public void onScroll(ScrollEvent event) {
-                            Scheduler.get().scheduleDeferred(
-                                    new ScheduledCommand() {
-                                        public void execute() {
-                                            focusElement.getStyle().setTop(
-                                                    getScrollPosition(),
-                                                    Unit.PX);
-                                            focusElement
-                                                    .getStyle()
-                                                    .setLeft(
-                                                            getHorizontalScrollPosition(),
-                                                            Unit.PX);
-                                        }
-                                    });
-                        }
-                    });
-                } else {
-                    style.setPosition(Position.FIXED);
-                    style.setTop(0, Unit.PX);
-                    style.setLeft(0, Unit.PX);
-                }
-                getElement().appendChild(focusElement);
-                /* Sink from focusElemet too as focusa and blur don't bubble */
-                DOM.sinkEvents((Element) focusElement.cast(), Event.FOCUSEVENTS);
-                // revert to original, not focusable
-                getElement().setPropertyObject("tabIndex", null);
-
-                /*
-                 * Firefox auto-repeat works correctly only if we use a key
-                 * press handler, other browsers handle it correctly when using
-                 * a key down handler
-                 */
-                if (BrowserInfo.get().isGecko()) {
-                    addDomHandler(navKeyPressHandler, KeyPressEvent.getType());
-                } else {
-                    addDomHandler(navKeyDownHandler, KeyDownEvent.getType());
-                }
-                addDomHandler(navKeyUpHandler, KeyUpEvent.getType());
-            }
-        };
-
-        @Override
-        public void setFocus(boolean focus) {
-            if (focus) {
-                FocusImpl.getFocusImplForPanel().focus(
-                        (Element) focusElement.cast());
-            } else {
-                FocusImpl.getFocusImplForPanel().blur(
-                        (Element) focusElement.cast());
-            }
-        };
-
-        @Override
-        public void setTabIndex(int tabIndex) {
-            getElement().setTabIndex(-1);
-            /*
-             * GWT bug with constructors ?? focusElement is null when compiled
-             * to js. TODO ensure this works when compiled without draftCompile
-             */
-            if (focusElement != null) {
-                focusElement.setTabIndex(tabIndex);
-            }
-        };
-
-    };
+    private final FocusableScrollPanel scrollBodyPanel = new FocusableScrollPanel();
 
     private KeyPressHandler navKeyPressHandler = new KeyPressHandler() {
         public void onKeyPress(KeyPressEvent keyPressEvent) {
@@ -500,6 +417,18 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
         scrollBodyPanel.addScrollHandler(this);
         scrollBodyPanel.setStyleName(CLASSNAME + "-body");
 
+        /*
+         * Firefox auto-repeat works correctly only if we use a key press
+         * handler, other browsers handle it correctly when using a key down
+         * handler
+         */
+        if (BrowserInfo.get().isGecko()) {
+            scrollBodyPanel.addKeyPressHandler(navKeyPressHandler);
+        } else {
+            scrollBodyPanel.addKeyDownHandler(navKeyDownHandler);
+        }
+        scrollBodyPanel.addKeyUpHandler(navKeyUpHandler);
+
         setStyleName(CLASSNAME);
 
         add(tHead);