diff options
| -rw-r--r-- | client/src/main/java/com/vaadin/client/ResourceLoader.java | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/client/src/main/java/com/vaadin/client/ResourceLoader.java b/client/src/main/java/com/vaadin/client/ResourceLoader.java index 69cb11dc9f..d1f615a068 100644 --- a/client/src/main/java/com/vaadin/client/ResourceLoader.java +++ b/client/src/main/java/com/vaadin/client/ResourceLoader.java @@ -249,7 +249,10 @@ public class ResourceLoader { addOnloadHandler(linkTag, new ResourceLoadListener() { @Override public void onLoad(ResourceLoadEvent event) { - fireLoad(event); + // Must wait for all HTML imports to finish + // processing to ensure that e.g. the template is + // parsed when calling the element constructor. + runWhenHtmlImportsReady(() -> fireLoad(event)); } @Override @@ -465,4 +468,28 @@ public class ResourceLoader { private static Logger getLogger() { return Logger.getLogger(ResourceLoader.class.getName()); } + + private static native boolean supportsHtmlWhenReady() + /*-{ + return !!($wnd.HTMLImports && $wnd.HTMLImports.whenReady); + }-*/; + + private static native void addHtmlImportsReadyHandler(Runnable handler) + /*-{ + $wnd.HTMLImports.whenReady($entry(function() { + handler.@Runnable::run()(); + })); + }-*/; + + protected void runWhenHtmlImportsReady(Runnable runnable) { + if (GWT.isClient() && supportsHtmlWhenReady()) { + addHtmlImportsReadyHandler(() -> { + runnable.run(); + }); + } else { + runnable.run(); + } + + } + } |