document unload promise resolving correctly with promise shim

diff --git a/client/src/index.html.tmpl b/client/src/index.html.tmpl
index 71c1d00cb3ae15e44a052865350e21e70e067768..a47084c8cfa0b78c4ba80cba69957a66a0ec0b3d 100644 (file)
--- a/client/src/index.html.tmpl
+++ b/client/src/index.html.tmpl
@@ -471,6 +471,12 @@
         }\r
 \r
         onload_promise = new Promise(function (resolve) {\r
+            // Document may already be loaded if we had to load the Promise shim seperately\r
+            if (document.readyState === 'complete') {\r
+                resolve();\r
+                return;\r
+            }\r
+\r
             window.onload = resolve;\r
         });\r
 \r