OSDN Git Service

fix X.View for webkit.
authoritozyun <itozyun@user.sourceforge.jp>
Thu, 18 Jul 2013 22:27:03 +0000 (07:27 +0900)
committeritozyun <itozyun@user.sourceforge.jp>
Thu, 18 Jul 2013 22:27:03 +0000 (07:27 +0900)
0.6.x/js/core/14_XView.js

index 4afe06a..1d61b79 100644 (file)
@@ -3,13 +3,17 @@ X.View = (function( window, document ){
        var view = X.UA.IE ?\r
                ( document.compatMode !== "CSS1Compat" ? document.body : document.documentElement ) : window,\r
                lock = 0, w = 0, h = 0,\r
-               resize, delayResize;\r
+               resize, delayResize, _timer;\r
 \r
 /* -----------------------------------------------\r
  * Document Ready\r
  *  Dean Edwards/Matthias Miller/John Resig\r
  */\r
        function init(){\r
+               if( _timer ){\r
+                       clearInterval( _timer );\r
+                       _timer = void 0;\r
+               };\r
                if( X.View.ready ) return;\r
                X.View.ready = true;\r
                X.View.dispatch( { type : X.ViewEvent.SYS_READY, w : w, h : h } );\r
@@ -32,11 +36,8 @@ X.View = (function( window, document ){
                };      \r
        };\r
        if( X.UA.WebKit ){ // sniff\r
-               var _timer = setInterval( function(){\r
-                       if( /loaded|complete/.test( document.readyState ) ){\r
-                               clearInterval( _timer );\r
-                               init();\r
-                       };\r
+               _timer = setInterval( function(){\r
+                       if( /loaded|complete/.test( document.readyState ) ) init();\r
                }, 10);\r
        };\r
        \r