Version 0.6.152, fix X.OAuth2.

[pettanr/clientJs.git] / 0.6.x / js / 06_net / 05_XXHRGadget.js

diff --git a/0.6.x/js/06_net/05_XXHRGadget.js b/0.6.x/js/06_net/05_XXHRGadget.js
index 3d2cf68..28dc843 100644 (file)
--- a/0.6.x/js/06_net/05_XXHRGadget.js
+++ b/0.6.x/js/06_net/05_XXHRGadget.js
@@ -46,7 +46,7 @@ var X_NET_GIMR_canUse         = 5.5 <= X_UA[ 'IE' ] || !X_UA[ 'IE' ],
 \r
 function X_NET_GIMR_detectImageOverIframe(){\r
        var raw = X_NET_GIMR_gadgetIframe[ '_rawObject' ],\r
-               iwin, ret, n, error, data = null;\r
+               iwin, ret, n, error, data = null, zero, e;\r
        \r
        if( raw ){\r
                iwin = raw.contentWindow || ( raw.contentDocument && raw.contentDocument.parentWindow ) || window.frames[ X_NET_GIMR_iframeName ];\r
@@ -91,7 +91,7 @@ function X_NET_GIMR_detectImageOverIframe(){
                                                        X_NET_GIMR_receivedString = ret;\r
                                                };\r
 \r
-                                               var zero = String.fromCharCode( 0 );\r
+                                               zero = String.fromCharCode( 0 );\r
                                                console.log( _builtin_decodeURI( X_NET_GIMR_receivedString ).split( zero + '002' ).join( '--' ).split( zero + 'E0F' ).join( '--' ) );\r
                                                ret = X_String_parseTrustedJsonString( _builtin_decodeURI( X_NET_GIMR_receivedString ).split( zero + '002' ).join( '。' ).split( zero + 'F0E' ).join( '．' ) );\r
                                                \r
@@ -105,18 +105,20 @@ function X_NET_GIMR_detectImageOverIframe(){
                                                                break;\r
                                                };\r
                                                \r
-                                               console.dir( data || ret );\r
+                                               //console.dir( data || ret );\r
                                                \r
                                                X_NET_GIMRWrapper._busy = false;\r
                                                \r
                                                X_NET_GIMRWrapper\r
-                                                       [ 'asyncDispatch' ]({\r
-                                                               type      : error ? X_EVENT_ERROR : X_EVENT_SUCCESS,\r
-                                                               state     : ret[ 'rc' ] || ( error ? ret[ 'code' ] || 400 : 200 ),\r
+                                                       [ 'asyncDispatch' ]( e = {\r
+                                                               type      : error || ret[ 'rc' ] < 200 || 400 < ret[ 'rc' ] ? X_EVENT_ERROR : X_EVENT_SUCCESS,\r
+                                                               status    : ret[ 'rc' ] || ( error ? ret[ 'code' ] || 400 : 200 ),\r
                                                                data      : data,\r
                                                                'headers' : ret[ 'headers' ],\r
                                                                'message' : error && ret[ 'errors' ].join( '\n' )\r
                                                        });\r
+                                               \r
+                                               //console.dir( e );\r
                                                        \r
                                                X_NET_GIMR_timerID = X_NET_GIMR_phase = 0;\r
                                                X_NET_GIMR_lastHashString = '';                                                 \r
@@ -179,7 +181,7 @@ X_NET_GIMRWrapper = X_Class_override(
                        \r
                        X_NET_GIMR_requestOriginal = X_Object_deepCopy( obj );\r
        \r
-                       console.dir( obj );\r
+                       //console.dir( obj );\r
                        \r
                        X_NET_GIMR_requestOptions = {\r
                                'CONTENT_TYPE'     : 'TEXT',\r