Fix the platform identifying code.

Fix the longstanding IE refresh bug by ensuring document is ready. Closes cappuccino#98.
280north · Jan 12, 2010 · ef0c840 · ef0c840
1 parent 608853d
commit ef0c840
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 5 deletions.
diff --git a/Objective-J/Runtime/bootstrap.js b/Objective-J/Runtime/bootstrap.js
@@ -21,4 +21,28 @@
  */
 
 if (window.OBJJ_MAIN_FILE)
-    objj_import(OBJJ_MAIN_FILE, YES, function() { main(); });
+{
+    var addOnload = function(handler
+    {
+        if (window.addEventListener)
+            window.addEventListener("load", handler, false);
+        else if (window.attachEvent)
+            window.attachEvent("onload", handler);
+    }
+
+    var documentLoaded = NO;
+    var defaultHandler = function()
+    {
+        documentLoaded = YES;
+    }
+
+    addOnload(defaultHandler);
+
+    objj_import(OBJJ_MAIN_FILE, YES, function()
+    {
+        if (documentLoaded)
+            main();
+        else
+            addOnload(main);
+    });
+}
diff --git a/Objective-J/Runtime/file.js b/Objective-J/Runtime/file.js
@@ -32,10 +32,13 @@ var OBJJ_ENVIRONMENTS = ENVIRONMENTS;
 #ifdef PLATFORM_USERAGENT
 var userAgent = window.navigator.userAgent;
 
-if (userAgent.indexOf("MSIE 7") !== -1)
-    OBJJ_ENVIRONMENTS.unshift("IE7");
-else if (userAgent.indexOf("MSIE 8") !== -1)
-    OBJJ_ENVIRONMENTS.unshift("IE8");
+if (userAgent.indexOf("MSIE") !== -1)
+{
+    if (userAgent.indexOf("MSIE 8") !== -1)
+        OBJJ_ENVIRONMENTS.unshift("IE8");
+    else
+        OBJJ_ENVIRONMENTS.unshift("IE7");
+}
 else
     OBJJ_ENVIRONMENTS.unshift("W3C");
 #endif