Version 0.6.160, fix X.Net.

[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 443d455..bbff1e0 100644 (file)
--- a/0.6.x/js/06_net/05_XXHRGadget.js
+++ b/0.6.x/js/06_net/05_XXHRGadget.js
@@ -62,7 +62,7 @@ function X_NET_GIMR_detectImageOverIframe(){
                                switch( X_NET_GIMR_phase ){\r
                                        case 0 : // init\r
                                                // TODO 分割\r
-                                               iwin.location.href = X_NET_GIMR_GADGET_URL + '#' + encodeURIComponent( X_NET_GIMR_toJSONString( X_NET_GIMR_requestOptions ) );\r
+                                               iwin.location.href = X_NET_GIMR_GADGET_URL + '#' + encodeURIComponent( X_JSON_stringify( X_NET_GIMR_requestOptions ) );\r
                                                break;\r
                                                \r
                                        case 1 : // after makeRequest > :ok 待ち\r
@@ -114,12 +114,12 @@ function X_NET_GIMR_detectImageOverIframe(){
                                                        [ '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
+                                                               response  : data,\r
                                                                'headers' : ret[ 'headers' ],\r
                                                                'message' : error && ret[ 'errors' ].join( '\n' )\r
                                                        });\r
                                                \r
-                                               //console.dir( e );\r
+                                               console.dir( e );\r
                                                        \r
                                                X_NET_GIMR_timerID = X_NET_GIMR_phase = 0;\r
                                                X_NET_GIMR_lastHashString = '';                                                 \r
@@ -132,41 +132,12 @@ function X_NET_GIMR_detectImageOverIframe(){
                };\r
        };\r
 };\r
-/*\r
-(function( i, l, res ){\r
-       var start = X.Timer.now(), loc = location, res = [], hash;\r
-       for( ; i < l; ++i ){\r
-               loc.replace = chr = '#' + String.fromCharCode( i );\r
-               hash = _builtin_decodeURI( loc.hash );\r
-               if( _builtin_decodeURI( chr ) !== hash ) res.push( i + ':' + _builtin_decodeURI( chr ) );\r
-               if( start + 16 < X.Timer.now() ){\r
-                       //console.log( i + ' / ' + l + ' ' + start + ' ' + X.Timer.now()  );\r
-                       X.Timer.once( 16, arguments.callee, [ ++i, l, res ] );\r
-                       return;\r
-               };\r
-       };\r
-       alert( res.length + '\n' + res.join() );\r
-})( 0xff, 0xffff, [] ); */\r
 \r
 // http://outcloud.blogspot.jp/2015/06/gecko-location-hash.html\r
 function X_Net_GIMR_decodeLocationHash( str ){\r
        return X_UA[ 'Gecko' ] ? unescape( str ) : decodeURIComponent( str );\r
 };\r
 \r
-// コマンドが長い場合、分割する\r
-function X_NET_GIMR_toJSONString( obj ){\r
-       var json = '', k, v;\r
-       for( k in obj ){\r
-               if( json ) json += ',';\r
-               v = obj[ k ];\r
-               v = v || v === 0 ? v : null;\r
-               json += '"' + k + '":' + ( X_Type_isObject( v ) ? X_NET_GIMR_toJSONString( v ) : X_Type_isString( v ) ? '"' + v + '"' : v );\r
-       };\r
-       console.log( json );\r
-       return '{' + json + '}';\r
-};\r
-\r
-\r
 X_TEMP.X_Net_GIMR_init = function(){\r
        // TODO extend NinjaIframe\r
        X_NET_GIMRWrapper = X_Class_override(\r
@@ -196,7 +167,7 @@ X_TEMP.X_Net_GIMR_props = {
                                                        name              : X_NET_GIMR_iframeName,\r
                                                        id                : X_NET_GIMR_iframeName,\r
                                                        src               : X_NET_GIMR_GADGET_URL + '#' + encodeURIComponent(\r
-                                                               X_NET_GIMR_toJSONString( { 'img' : X_URL_toAbsolutePath( X_NET_GIMR_IMAGE_URL ), 'len' : 1000, 'itvl' : 200 } ) ),\r
+                                                               X_JSON_stringify( { 'img' : X_URL_toAbsolutePath( X_NET_GIMR_IMAGE_URL ), 'len' : 1000, 'itvl' : 200 } ) ),\r
                                                        scrolling         : 'no',\r
                                                        allowtransparency : 'no',                                       \r
                                                        frameborder       : 0,\r