OSDN Git Service

Version 0.6.175, fix X.UA & X.WebAudio.
[pettanr/clientJs.git] / 0.6.x / js / 06_net / 01_XNetXHR.js
index 265cc79..d882cc1 100644 (file)
@@ -31,6 +31,7 @@ http://d.hatena.ne.jp/sshi/20060904/p1
 itozyun 2014-10-30 20:55:41\r
 basic 認証のかかったhtml を表示して、そのjsが xhr をすると Android1.6 では 401 error が返る。Android 2.3 では解決している。\r
 Android1.6- の XHR で 401 エラーが返った場合は、iframe に xml を表示させてその内容を取ればサーバ側の対応無しでいけるかも?\r
+Android2 にも xdomain な GET が一回しかできない問題 gears 使えない?\r
 \r
 IE9 で 画像バイナリの取得 VBA をかましている\r
 http://web.archive.org/web/20130808105151/http://gurimmer.lolipop.jp/daihakken/2012/05/22/javascriptajaxxmlhttprequest%E3%82%92%E4%BD%BF%E3%81%A3%E3%81%9Fajax%E3%81%AE%E3%82%A8%E3%83%B3%E3%82%B3%E3%83%BC%E3%83%89\r
@@ -110,7 +111,9 @@ X[ 'XHR' ] = {
        'UPLOAD_PROGRESS' : X_Net_XHR_upload,\r
 \r
        // or gadget proxy or flash\r
-       'CORS'            : X_Net_XHR_xdr || X_Net_XHR_cors\r
+       'CORS'            : X_Net_XHR_xdr || X_Net_XHR_cors,\r
+       \r
+       'BINARY'          : X_Pulgin_VBS_ENABLED\r
 };\r
 \r
 if( X_Net_XHR_msXMLVer ) X[ 'XHR' ][ 'MSXML_VERSION' ] = X_Net_XHR_msXMLVer;\r
@@ -190,9 +193,8 @@ X_TEMP.X_Net_XHR_params = {
                                                // js, css\r
                                                        raw.responseType = 'text';\r
                                                        break;\r
-                                               case 'json' :\r
-                                               case 'moz-json' : // firefox9-\r
-                                                       raw.responseType = X_UA[ 'Gecko' ] ? this._dataType : ''; // Iron 37 でエラー\r
+                                               case 'json' : // firefox9- は moz-json\r
+                                                       raw.responseType = X_UA[ 'Gecko' ] < 10 ? 'moz-json' : X_UA[ 'Gecko' ] ? this._dataType : ''; // Iron 37 でエラー\r
                                                        break;\r
                                                case 'document' :\r
                                                case 'xml' :\r
@@ -211,11 +213,15 @@ X_TEMP.X_Net_XHR_params = {
                                \r
                                // http://www.quirksmode.org/blog/archives/2005/09/xmlhttp_notes_r_1.html\r
                                if( !this._isMsXML && raw.overrideMimeType ){   \r
-                                       switch( X_URL_getEXT( url ) ){\r
+                                       switch( X_URL_getEXT( url ) || this._dataType ){\r
                                                case 'html' :\r
+                                               case 'htm' :\r
                                                case 'xml' :\r
                                                        tmp = 'text/xml';\r
                                                        break;\r
+                                               case 'json' :\r
+                                                       tmp = 'application/json'; // 2015.6.29\r
+                                                       break;\r
 \r
                                                case 'mp3' :\r
                                                        tmp = 'audio/mpeg';\r
@@ -250,9 +256,10 @@ X_TEMP.X_Net_XHR_params = {
                                                headers[ 'Pragma' ] = 'no-cache';\r
                                                headers[ 'Cache-Control' ] = 'no-cache';\r
                                                headers[ 'If-Modified-Since' ] = 'Thu, 01 Jun 1970 00:00:00 GMT';\r
-                                       } else */                                       \r
+                                       } */\r
+               \r
                                        // http://nakigao.sitemix.jp/blog/?p=2040\r
-                                       // json å\8f\96å¾\97æ\99\82ã\81« Safariã\81§HTTP/412ã\81®ã\82¨ã\83©ã\83¼ã\80\82ä½\86ã\81\97ç\9b¸æ\89\8bã\81\8c audio ã\81®å ´å\90\88ã\80\81ã\81\93ã\81®æ\8c\87å®\9aã\81\8cã\81\82ã\82\8bã\81¨ã\83­ã\83¼ã\83\89ã\81«å¤±æ\95\97ã\81\99ã\82\8bã\80\82 iOS8.2, iOS7.1 ã\81§ã\81¯é\81­é\81\87ã\81\9bã\81\9a\r
+                                       // json 取得時に SafariでHTTP/412のエラー。但し相手が audio の場合この指定があるとロードに失敗する。 iOS8.2, iOS7.1 では遭遇せず\r
                                        if( this._dataType === 'json' ){\r
                                                headers[ 'If-Modified-Since' ] = ( new Date ).toUTCString();\r
                                        };\r
@@ -449,7 +456,7 @@ X_TEMP.X_Net_XHR_params = {
                                                                        // eval() を使っているけど JSON の無いブラウザは XDomain な XHR はできないのでよしとする。\r
                                                                        // XDomain な XHR の際は Flash 等で代替し、その中に Json parser も組み込む。\r
                                                                        // http://d.hatena.ne.jp/sshi/20060904/p1\r
-                                                                       if( !X_Type_isObject( data ) ) data = X_String_parseTrustedJsonString( data );\r
+                                                                       if( !X_Type_isObject( data ) ) data = X_JSON_parseTrustableString( data );\r
                                                                        break;\r
                                                                case 'document' :\r
                                                                case 'xml' :\r
@@ -463,7 +470,6 @@ X_TEMP.X_Net_XHR_params = {
                                                                        data = raw[ 'response' ] || raw[ 'responseText' ]; // とりあえず\r
                                                                        break;\r
                                                        };\r
-\r
                                                        X_NET_XHRWrapper[ 'asyncDispatch' ]( 32, { type : X_EVENT_SUCCESS, status : status || 200, response : data, 'headers' : headers || null } );\r
                                                } else {\r
                                                        X_NET_XHRWrapper[ 'asyncDispatch' ]( 32, { type : X_EVENT_ERROR, status : status || 400, 'headers' : headers || null } );\r
@@ -472,8 +478,8 @@ X_TEMP.X_Net_XHR_params = {
                                        \r
                                        case 'progress' :\r
                                                if( e.lengthComputable ){\r
-                                                       X_NET_XHRWrapper._percent = e.loaded / e.total;\r
-                                                       live && X_NET_XHRWrapper[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : X_NET_XHRWrapper._percent } );\r
+                                                       X_NET_XHRWrapper._percent = e.loaded / e.total * 100;\r
+                                                       live && X_NET_XHRWrapper._percent < 100 && X_NET_XHRWrapper[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : X_NET_XHRWrapper._percent } );\r
                                                };\r
                                                break;\r
                                        \r
@@ -504,10 +510,12 @@ X_TEMP.X_Net_XHR_params = {
                        },\r
                        \r
                        onUploadProgress : X_Net_XHR_upload && function( e ){\r
-                               var raw  = X_NET_XHRWrapper[ '_rawObject' ].upload,\r
-                                       live = !X_NET_XHRWrapper._canceled,\r
-                                       states, data;\r
-                               live && X_NET_XHRWrapper[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : X_NET_XHRWrapper._percent, 'uploadPercent' : ( e.loaded / e.total ) } );\r
+                               !X_NET_XHRWrapper._canceled &&\r
+                                       X_NET_XHRWrapper[ 'asyncDispatch' ]( {\r
+                                               type            : X_EVENT_PROGRESS,\r
+                                               'percent'       : X_NET_XHRWrapper._percent,\r
+                                               'uploadPercent' : e.loaded / e.total * 100\r
+                                       } );\r
                        }\r
                };\r
        // 同期リクエストでなければならない場合, unload, beforeunload時\r