Version 0.6.160, fix X.Net.

[pettanr/clientJs.git] / 0.6.x / js / 06_net / 00_XNet.js

diff --git a/0.6.x/js/06_net/00_XNet.js b/0.6.x/js/06_net/00_XNet.js
index 6dbca99..fc5dc58 100644 (file)
--- a/0.6.x/js/06_net/00_XNet.js
+++ b/0.6.x/js/06_net/00_XNet.js
@@ -174,7 +174,7 @@ X[ 'Net' ] = X_EventDispatcher[ 'inherits' ](
                                \r
                                X_Pair_create( this, opt );\r
                                \r
-                               this[ 'listen' ]( [ X_EVENT_BEFORE_KILL_INSTANCE, X_EVENT_KILL_INSTANCE ], X_NET_proxyDispatch );\r
+                               this[ 'listen' ]( X_EVENT_KILL_INSTANCE, X_NET_proxyDispatch );\r
                                \r
                                X_NET_QUEUE_LIST[ X_NET_QUEUE_LIST.length ] = this;\r
                                !X_NET_currentQueue && X_NET_shiftQueue();\r
@@ -228,21 +228,20 @@ function X_NET_proxyDispatch( e ){
        var i, flag, auth;\r
        \r
        switch( e.type ){\r
-               case X_EVENT_BEFORE_KILL_INSTANCE :\r
-                       if( this === X_NET_currentQueue && X_NET_completePhase ) return X_Callback_PREVENT_DEFAULT;\r
-                       break;\r
-               \r
                case X_EVENT_KILL_INSTANCE :\r
-                       i = X_NET_QUEUE_LIST.indexOf( this );\r
-                       \r
-                       if( i !== -1 ){\r
-                               X_NET_QUEUE_LIST.splice( i, 1 );\r
-                               flag = true;\r
+                       if( this === X_NET_currentQueue && X_NET_completePhase ){\r
+                               X_Pair_release( this );\r
+                               X_NET_shiftQueue();\r
+                               X_NET_completePhase = false;\r
                        } else\r
                        if( this === X_NET_currentQueue ){\r
                                X_NET_currentWrapper.cancel();\r
                                X_NET_shiftQueue();\r
                                flag = true;\r
+                       } else\r
+                       if( ( i = X_NET_QUEUE_LIST.indexOf( this ) ) !== -1 ){\r
+                               X_NET_QUEUE_LIST.splice( i, 1 );\r
+                               flag = true;\r
                        };\r
                        \r
                        if( flag ){ // flag が立つ場合、これは中断\r
@@ -263,18 +262,18 @@ function X_NET_proxyDispatch( e ){
                        };\r
                        \r
                case X_EVENT_SUCCESS :\r
-               case X_EVENT_TIMEOUT :\r
                        X_NET_completePhase = true;\r
                        this\r
                                [ 'listenOnce' ]( X_EVENT_COMPLETE, X_NET_proxyDispatch )\r
-                               [ 'unlisten' ]( [ X_EVENT_BEFORE_KILL_INSTANCE, X_EVENT_KILL_INSTANCE ], X_NET_proxyDispatch )\r
                                [ 'asyncDispatch' ]( e );\r
                        this[ 'asyncDispatch' ]( 32, { type : X_EVENT_COMPLETE, 'lastEventType' : e.type } );\r
                        break;\r
+\r
                case X_EVENT_COMPLETE :\r
                        X_Pair_release( this );\r
                        X_NET_shiftQueue();\r
                        X_NET_completePhase = false;\r
+                       this[ 'unlisten' ]( X_EVENT_KILL_INSTANCE, X_NET_proxyDispatch );\r
                        this[ 'kill' ]();\r
                        break;\r
        };\r
@@ -286,7 +285,7 @@ function X_NET_shiftQueue(){
        if( X_NET_currentQueue ){\r
                if( X_NET_currentWrapper._busy ) return;\r
                X_NET_currentWrapper\r
-                       [ 'unlisten' ]( [ X_EVENT_PROGRESS, X_EVENT_SUCCESS, X_EVENT_ERROR, X_EVENT_TIMEOUT ], X_NET_currentQueue, X_NET_proxyDispatch )\r
+                       [ 'unlisten' ]( [ X_EVENT_PROGRESS, X_EVENT_SUCCESS, X_EVENT_ERROR ], X_NET_currentQueue, X_NET_proxyDispatch )\r
                        .reset();\r
                X_NET_currentQueue = X_NET_currentWrapper = X_NET_currentData = null;\r
        };\r
@@ -346,7 +345,7 @@ function X_NET_shiftQueue(){
                        break;\r
        };\r
        \r
-       X_NET_currentWrapper[ 'listen' ]( [ X_EVENT_PROGRESS, X_EVENT_SUCCESS, X_EVENT_ERROR, X_EVENT_TIMEOUT ], X_NET_currentQueue, X_NET_proxyDispatch );\r
+       X_NET_currentWrapper[ 'listen' ]( [ X_EVENT_PROGRESS, X_EVENT_SUCCESS, X_EVENT_ERROR ], X_NET_currentQueue, X_NET_proxyDispatch );\r
        \r
        X_NET_currentWrapper.load( X_NET_currentData );\r
 };\r