Version 0.5.151, fix X.Timer.remove & X.OAuth2 is working.

[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 7d6393c..ec0ee1a 100644 (file)
--- a/0.6.x/js/06_net/00_XNet.js
+++ b/0.6.x/js/06_net/00_XNet.js
@@ -72,7 +72,7 @@ X[ 'Net' ] = X_EventDispatcher[ 'inherits' ](
                        'netVersion' : 0,\r
                        \r
                        'Constructor' : function( urlOrObject, opt_options ){\r
-                               var v, opt, url, type;\r
+                               var v, opt, url, type, auth;\r
                                \r
                                if( X_Type_isObject( opt = urlOrObject ) ){\r
                                        if( v = opt[ 'xhr' ] ){\r
@@ -135,7 +135,13 @@ X[ 'Net' ] = X_EventDispatcher[ 'inherits' ](
                                        return;\r
                                };\r
                                \r
+                               if( auth = opt[ 'auth' ] ){\r
+                                       delete opt[ 'auth' ];\r
+                               };\r
                                opt = X_Object_deepCopy( opt );\r
+                               if( auth ){\r
+                                       opt[ 'auth' ] = auth; // auth は deep copy されるとまずい\r
+                               };\r
                                opt.netType   = type;\r
                                opt[ 'url'  ] = url;                            \r
                                \r
@@ -269,7 +275,7 @@ function X_NET_shiftQueue(){
        switch( X_NET_currentData.netType ){\r
                case X_NET_TYPE_XHR :\r
                        \r
-                       // TODO (xProtocol |　method) & canUse -> gadget.io.makeRequset, flash\r
+                       // TODO (xProtocol |　method='update' | !cors) & canUse -> gadget.io.makeRequset, flash\r
                        // force 'gadget', 'flash'\r
                        switch( X_NET_currentData[ 'test' ] ){\r
                                case 'gadget' :\r
@@ -277,6 +283,7 @@ function X_NET_shiftQueue(){
                                        break;\r
                                case 'flash'  :\r
                                        break;\r
+                               \r
                                default :\r
                                        X_NET_currentWrapper = X_NET_XHRWrapper || X_TEMP.X_Net_XHR_init();\r
                        };\r
@@ -285,16 +292,17 @@ function X_NET_shiftQueue(){
                        // OAuth2\r
                        if( auth = X_NET_currentData[ 'auth' ] ){\r
                                authSettings = X_Pair_get( auth );\r
-                               switch( auth.state() ){\r
+                               switch( auth[ 'state' ]() ){\r
                                        case 0 :\r
                                        case 1 :\r
+                                       case 2 :\r
                                                if( !( auth[ 'dispatch' ]( X_EVENT_NEED_AUTH ) & X_Callback_PREVENT_DEFAULT ) ){\r
                                                        authSettings.lazyReq = X_NET_currentQueue;\r
                                                };\r
                                                X_NET_currentQueue = null;\r
                                                X_NET_shiftQueue();\r
                                                break;\r
-                                       case 2 : // refresh token\r
+                                       case 3 : // refresh token\r
                                                X_NET_QUEUE_LIST.push( X_NET_currentQueue );\r
                                                X_NET_currentQueue = null;\r
                                                X_NET_shiftQueue();\r
@@ -312,9 +320,6 @@ function X_NET_shiftQueue(){
                case X_NET_TYPE_IMAGE :\r
                        X_NET_currentWrapper = X_NET_ImageWrapper || X_TEMP.X_NET_Image_init();\r
                        break;\r
-               case 5 :\r
-                       X_NET_currentWrapper = X_NET_GIMRWrapper;\r
-                       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