Version 0.6.174, rename vars for closure compiler ADVANCED_OPTIMAIZATIONS.

[pettanr/clientJs.git] / 0.6.x / js / 01_core / 16_XTimer.js

diff --git a/0.6.x/js/01_core/16_XTimer.js b/0.6.x/js/01_core/16_XTimer.js
index 744a33b..6069036 100644 (file)
--- a/0.6.x/js/01_core/16_XTimer.js
+++ b/0.6.x/js/01_core/16_XTimer.js
@@ -96,18 +96,18 @@ var
                                f;\r
                        i === 0 && ( X_Timer_requestID = X_Timer_REQ_ANIME_FRAME( X_Timer_onEnterFrame ) );\r
                        f = X_Closure_classifyCallbackArgs( args1, args2, args3 );\r
-                       if( !f.kind ) f = { func : f };\r
+                       if( !f.cbKind ) f = { func : f };\r
                        X_Timer_REQ_FRAME_LIST[ i ] = f;\r
-                       return f.uid = ++X_Timer_uid;\r
+                       return f._uid = ++X_Timer_uid;\r
                }) :\r
                (function( args1, args2, args3 ){\r
                        var i = X_Timer_REQ_FRAME_LIST.length,\r
                                f;\r
                        i === 0 && ( X_Timer_requestID = X_Timer_add( 0, 1, X_Timer_onEnterFrame ) );\r
                        f = X_Closure_classifyCallbackArgs( args1, args2, args3 );\r
-                       if( !f.kind ) f = { func : f };\r
+                       if( !f.cbKind ) f = { func : f };\r
                        X_Timer_REQ_FRAME_LIST[ i ] = f;\r
-                       return f.uid = ++X_Timer_uid;\r
+                       return f._uid = ++X_Timer_uid;\r
                }),\r
 \r
        /**\r
@@ -131,8 +131,8 @@ var
                                X_Timer_removal[ uid ] = true;\r
                        } else {\r
                                for( ; i; ){\r
-                                       if( ( f = list[ --i ] ).uid < uid ) break;\r
-                                       if( f.uid == uid ){\r
+                                       if( ( f = list[ --i ] )._uid < uid ) break;\r
+                                       if( f._uid == uid ){\r
                                                list.splice( i, 1 );\r
                                                // gecko では cancelRequestAnimationFrame が無い場合がある\r
                                                l === 1 && X_Timer_CANCEL_ANIME_FRAME && X_Timer_CANCEL_ANIME_FRAME( X_Timer_requestID );\r
@@ -154,8 +154,8 @@ var
                                X_Timer_removal[ uid ] = true;\r
                        } else {\r
                                for( ; i; ){\r
-                                       if( ( f = list[ --i ] ).uid < uid ) break;\r
-                                       if( f.uid == uid ){\r
+                                       if( ( f = list[ --i ] )._uid < uid ) break;\r
+                                       if( f._uid == uid ){\r
                                                list.splice( i, 1 );\r
                                                l === 1 && X_Timer_remove( X_Timer_requestID );\r
                                                break;\r
@@ -227,11 +227,11 @@ X[ 'Timer' ] = {
                hash = X_Closure_classifyCallbackArgs( args1, args2, args3 );\r
                if( !hash ) return -1; // dev only\r
                \r
-               if( !hash.kind ) hash = { func : hash };\r
-               hash.time  = time;\r
-               hash.last  = time;\r
-               hash.count = opt_count;\r
-               hash.uid   = ++X_Timer_uid;\r
+               if( !hash.cbKind ) hash = { func : hash };\r
+               hash._time  = time;\r
+               hash.last   = time;\r
+               hash._count = opt_count;\r
+               hash._uid   = ++X_Timer_uid;\r
                list[ list.length ] = hash;\r
                \r
            !X_Timer_busyTimeout && X_Timer_update();\r
@@ -270,7 +270,7 @@ X[ 'Timer' ] = {
                        X_Timer_removal[ uid ] = true;\r
                } else {\r
                        for( ; i; ){\r
-                               if( ( q = list[ --i ] ).uid == uid ){ // 数字の場合と文字の場合がある\r
+                               if( ( q = list[ --i ] )._uid == uid ){ // 数字の場合と文字の場合がある\r
                                        list.splice( i, 1 );\r
                                        \r
                                        /*\r
@@ -314,17 +314,17 @@ function X_Timer_onTimeout(){
     for( ; i < l; ++i ){\r
        q = list[ i ];\r
        if(\r
-               ( X_Timer_removal && X_Timer_removal[ q.uid ] ) || // timerId は remove 登録されている\r
+               ( X_Timer_removal && X_Timer_removal[ q._uid ] ) || // timerId は remove 登録されている\r
                        0 < ( q.last -= minus ) || // 時間が経過していない\r
                        heavy && ( q.last = 1 ) // 時間は経過したが、ヘビーフラグが立っている\r
                ){\r
                        continue;\r
                };\r
-               c = q.count;\r
+               c = q._count;\r
                \r
-               X_Timer_currentUID = q.uid;\r
+               X_Timer_currentUID = q._uid;\r
                \r
-               if( q.kind ){\r
+               if( q.cbKind ){\r
                        r = X_Closure_proxyCallback( q, [] );\r
                } else {\r
                        r = q.func();\r
@@ -344,8 +344,8 @@ function X_Timer_onTimeout(){
                        --l;\r
                        continue;\r
                } else\r
-               if( 1 < c ) --q.count;\r
-               q.last = q.time;\r
+               if( 1 < c ) --q._count;\r
+               q.last = q._time;\r
     };\r
     X_Timer_timerId     = X_Timer_currentUID = 0;\r
     X_Timer_busyTimeout = false;\r
@@ -392,7 +392,7 @@ function X_Timer_update(){
 // http://jsfiddle.net/warby_/X8YUZ/ Chrome で return が 0 の場合の挙動が他のブラウザと異なる\r
 function X_Timer_compareQueue( a, b ){\r
     if( a.last === b.last ){ // Chrome のみ\r
-        return a.uid - b.uid;\r
+        return a._uid - b._uid;\r
     };\r
     return a.last - b.last;\r
        // return a.last <= b.last ? -1 : 1; //a.last === b.last ? 0 : 1;\r
@@ -429,9 +429,9 @@ function X_Timer_onEnterFrame( time ){
     for( ; i < l; ++i ){\r
        q = list[ i ];\r
        \r
-       if( X_Timer_removal && X_Timer_removal[ q.uid ] ) continue;\r
+       if( X_Timer_removal && X_Timer_removal[ q._uid ] ) continue;\r
        \r
-               if( q.kind ){\r
+               if( q.cbKind ){\r
                        X_Closure_proxyCallback( q, args || ( args = [ time ] ) );\r
                } else {\r
                        q.func( time );\r