Merge branch 'master' into valo

Change-Id: Ifeb36e6c0acd156b7714f96f32ad7d4ff8416100

2 files changed, 29 insertions, 3 deletions

diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java
index c39beffd87..94fa3c3c01 100644
--- a/client/src/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/com/vaadin/client/ApplicationConnection.java
@@ -66,6 +66,7 @@ import com.google.gwt.user.client.Window.ClosingHandler;
 import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.ApplicationConfiguration.ErrorMessage;
+import com.vaadin.client.ApplicationConnection.ApplicationStoppedEvent;
 import com.vaadin.client.ResourceLoader.ResourceLoadEvent;
 import com.vaadin.client.ResourceLoader.ResourceLoadListener;
 import com.vaadin.client.communication.HasJavaScriptConnectorHelper;
@@ -471,6 +472,8 @@ public class ApplicationConnection implements HasHandlers {
 
     private Heartbeat heartbeat = GWT.create(Heartbeat.class);
 
+    private boolean tooltipInitialized = false;
+
     public static class MultiStepDuration extends Duration {
         private int previousStep = elapsedMillis();
 
@@ -580,10 +583,19 @@ public class ApplicationConnection implements HasHandlers {
 
             // initial UIDL provided in DOM, continue as if returned by request
             handleJSONText(jsonText, -1);
+        }
 
-            // Tooltip can't be created earlier because the necessary fields are
-            // not setup to add it in the correct place in the DOM
-            getVTooltip().showAssistive(new TooltipInfo(" "));
+        // Tooltip can't be created earlier because the
+        // necessary fields are not setup to add it in the
+        // correct place in the DOM
+        if (!tooltipInitialized) {
+            tooltipInitialized = true;
+            ApplicationConfiguration.runWhenDependenciesLoaded(new Command() {
+                @Override
+                public void execute() {
+                    getVTooltip().initializeAssistiveTooltips();
+                }
+            });
         }
     }
 
diff --git a/client/src/com/vaadin/client/VTooltip.java b/client/src/com/vaadin/client/VTooltip.java
index d1a2c395f7..b1315a0d8b 100644
--- a/client/src/com/vaadin/client/VTooltip.java
+++ b/client/src/com/vaadin/client/VTooltip.java
@@ -108,6 +108,20 @@ public class VTooltip extends VWindowOverlay {
         showTooltip();
     }
 
+    /**
+     * Initialize the tooltip overlay for assistive devices.
+     * 
+     * @param info
+     *            with the content of the tooltip
+     */
+    public void initializeAssistiveTooltips() {
+        updatePosition(null, true);
+        setTooltipText(new TooltipInfo(" "));
+        showTooltip();
+        hideTooltip();
+        description.getParentElement().getStyle().clearWidth();
+    }
+
     private void setTooltipText(TooltipInfo info) {
         if (info.getErrorMessage() != null && !info.getErrorMessage().isEmpty()) {
             em.setVisible(true);