Version 0.6.70, bugfix.

[pettanr/clientJs.git] / 0.6.x / js / 00_core / 05_XTimer.js

diff --git a/0.6.x/js/00_core/05_XTimer.js b/0.6.x/js/00_core/05_XTimer.js
index 1e90787..a5873d8 100644 (file)
--- a/0.6.x/js/00_core/05_XTimer.js
+++ b/0.6.x/js/00_core/05_XTimer.js
@@ -26,7 +26,8 @@ X.Timer = {
        endTime        : 0, // iOS\r
        next           : 0,\r
        busy           : false, // for Opera7\r
-\r
+       //frameBusy      : false,\r
+       \r
        REQ_FRAME_LIST : [],\r
        requestID      : 0,\r
        \r
@@ -87,24 +88,29 @@ X.Timer = {
            };\r
        },\r
        \r
+       // ページを読み込んでからの時間\r
        _onEnterFrame : function ( time ){\r
                var list = X.Timer.REQ_FRAME_LIST,\r
-                       i    = list.length,\r
-                       q;\r
-               time = time || ( Date.now ? Date.now() : +new Date );\r
-           for( ; i; ){\r
-               q = list[ --i ];\r
+                       l    = list.length,\r
+                       i    = 0, q;\r
+               //this.frameBusy = true;\r
+               time = time || X.getTime();\r
+               console.log( X.getTime() + ' , ' + time );\r
+           for( ; i < l; ++i ){\r
+               q = list[ i ];\r
                \r
                        if( q.k ){\r
                                q.a = [ time ];\r
                                X.Callback._proxyCallback( q );\r
                        } else {\r
-                               q.f( time );\r
+                               q( time );\r
                        };\r
                //delete f.uid;\r
                //f.kill && f.kill();\r
            };\r
-           list.length = 0;\r
+           //this.frameBusy = false;\r
+           list.splice( 0, l );\r
+           if( list.length ) X.Timer.requestID = _enterFrame( X.Timer._onEnterFrame );\r
        },\r
        \r
        add : function( time, opt_count, args1, args2, args3 ){\r