mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-10-06 17:12:50 +00:00
Fix the platform identifying code.
Fix the longstanding IE refresh bug by ensuring document is ready. Closes #98.
This commit is contained in:
1 parent
608853d4fa
commit
ef0c84072b
2 files changed
+32
-5
No files matched your search
Vendored
+25
-1
@@ -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);
|
||||
});
|
||||
}
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user