Version 0.6.176, add X.Script.

[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 fa1a6d4..c693cc2 100644 (file)
--- a/0.6.x/js/06_net/00_XNet.js
+++ b/0.6.x/js/06_net/00_XNet.js
@@ -218,7 +218,7 @@ var X_NET_TYPE_XHR   = 1,
 \r
        X_NET_QUEUE_LIST = [],\r
 \r
-       X_NET_XHRWrapper,\r
+       X_XHR,\r
        X_NET_JSONPWrapper,\r
        X_NET_FormWrapper,\r
        X_NET_ImageWrapper,\r
@@ -235,10 +235,10 @@ function X_NET_proxyDispatch( e ){
        switch( e.type ){\r
                case X_EVENT_KILL_INSTANCE :\r
                        if( this === X_NET_currentQueue && X_NET_completePhase ){\r
-                               if( X_NET_completePhase === 1 )\r
+                               if( X_NET_completePhase === 1 ){\r
                                        this[ 'unlisten' ]( X_EVENT_COMPLETE, X_NET_proxyDispatch )\r
                                                [ 'dispatch' ]( X_EVENT_COMPLETE );\r
-                               this.kill();//test\r
+                               };\r
                                X_NET_shiftQueue();\r
                                X_Pair_release( this );\r
                                X_NET_completePhase = 0;\r
@@ -299,8 +299,11 @@ function X_NET_shiftQueue(){
                X_NET_currentQueue = X_NET_currentWrapper = X_NET_currentData = null;\r
        };\r
        \r
+       console.log( '■■------------ X_NET_shiftQueue ' + X_NET_QUEUE_LIST.length );\r
+       \r
        if( !X_NET_QUEUE_LIST.length ) return;\r
 \r
+\r
        X_NET_currentQueue = X_NET_QUEUE_LIST.shift();\r
        X_NET_currentData  = X_Pair_get( X_NET_currentQueue );\r
        \r
@@ -317,7 +320,7 @@ function X_NET_shiftQueue(){
                                        break;\r
                                \r
                                default :\r
-                                       X_NET_currentWrapper = X_NET_XHRWrapper || X_TEMP.X_Net_XHR_init();\r
+                                       X_NET_currentWrapper = X_XHR || X_TEMP.X_XHR_init();\r
                        };\r
                        \r
                        \r
@@ -328,7 +331,7 @@ function X_NET_shiftQueue(){
                                        case 0 :\r
                                        case 1 :\r
                                        case 2 :\r
-                                               if( !( auth[ 'dispatch' ]( X_EVENT_NEED_AUTH ) & X_Callback_PREVENT_DEFAULT ) ){\r
+                                               if( !( auth[ 'dispatch' ]( X_EVENT_NEED_AUTH ) & X_CALLBACK_PREVENT_DEFAULT ) ){\r
                                                        authSettings.lazyRequests = authSettings.lazyRequests || [];\r
                                                        authSettings.lazyRequests.indexOf( X_NET_currentQueue ) === -1 && authSettings.lazyRequests.push( X_NET_currentQueue );\r
                                                };\r