Merge pull request #2230 from chaffeqa/patch-2

fix(load): correctly handle window loaded states
ionic-team · Sep 17, 2014 · a1af665 · a1af665
2 parents 9a57845 + 6b29d44
commit a1af665
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/js/utils/platform.js b/js/utils/platform.js
@@ -351,7 +351,8 @@
 
   var platformName = null, // just the name, like iOS or Android
   platformVersion = null, // a float of the major and minor, like 7.1
-  readyCallbacks = [];
+  readyCallbacks = [],
+  windowLoadListenderAttached;
 
   // setup listeners to know when the device is ready to go
   function onWindowLoad() {
@@ -364,8 +365,17 @@
       // cordova/phonegap object, so its just a browser, not a webview wrapped w/ cordova
       onPlatformReady();
     }
-    window.removeEventListener("load", onWindowLoad, false);
+    if (windowLoadListenderAttached){
+      window.removeEventListener("load", onWindowLoad, false);
+    }
+  }
+  if (document.readyState === 'complete') {
+    onWindowLoad();
+  } else {
+    windowLoadListenderAttached = true;
+    window.addEventListener("load", onWindowLoad, false);
   }
+
   window.addEventListener("load", onWindowLoad, false);
 
   function onPlatformReady() {