Add StateChangeHandler in init to come after component handler (#8888)

3 files changed, 16 insertions, 2 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java b/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java
index d2a2a5329e..9c0f670afa 100644
--- a/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java
+++ b/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java
@@ -44,7 +44,9 @@ public class JavaScriptConnectorHelper {
 
         // Wildcard rpc object
         rpcObjects.put("", JavaScriptObject.createObject());
+    }
 
+    public void init() {
         connector.addStateChangeHandler(new StateChangeHandler() {
             public void onStateChanged(StateChangeEvent stateChangeEvent) {
                 JavaScriptObject wrapper = getConnectorWrapper();
@@ -81,7 +83,7 @@ public class JavaScriptConnectorHelper {
 
                 // Init after setting up callbacks & rpc
                 if (!inited) {
-                    init();
+                    initJavaScript();
                     inited = true;
                 }
 
@@ -104,7 +106,7 @@ public class JavaScriptConnectorHelper {
         return object;
     }
 
-    private boolean init() {
+    private boolean initJavaScript() {
         ApplicationConfiguration conf = connector.getConnection()
                 .getConfiguration();
         ArrayList<String> attemptedNames = new ArrayList<String>();
diff --git a/src/com/vaadin/terminal/gwt/client/JavaScriptExtension.java b/src/com/vaadin/terminal/gwt/client/JavaScriptExtension.java
index e3dafab9bd..61c50dbcb4 100644
--- a/src/com/vaadin/terminal/gwt/client/JavaScriptExtension.java
+++ b/src/com/vaadin/terminal/gwt/client/JavaScriptExtension.java
@@ -15,6 +15,12 @@ public class JavaScriptExtension extends AbstractExtensionConnector implements
     private final JavaScriptConnectorHelper helper = new JavaScriptConnectorHelper(
             this);
 
+    @Override
+    protected void init() {
+        super.init();
+        helper.init();
+    }
+
     public JavaScriptConnectorHelper getJavascriptConnectorHelper() {
         return helper;
     }
diff --git a/src/com/vaadin/terminal/gwt/client/ui/JavaScriptComponentConnector.java b/src/com/vaadin/terminal/gwt/client/ui/JavaScriptComponentConnector.java
index 47afe95771..9ae60de1f7 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/JavaScriptComponentConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/JavaScriptComponentConnector.java
@@ -42,6 +42,12 @@ public class JavaScriptComponentConnector extends AbstractComponentConnector
         return (JavaScriptWidget) super.getWidget();
     }
 
+    @Override
+    protected void init() {
+        super.init();
+        helper.init();
+    }
+
     public JavaScriptConnectorHelper getJavascriptConnectorHelper() {
         return helper;
     }