X-Git-Url: http://git.osdn.jp/view?p=pettanr%2FclientJs.git;a=blobdiff_plain;f=0.6.x%2Fjs%2F06_net%2F01_XNetXHR.js;fp=0.6.x%2Fjs%2F06_net%2F01_XNetXHR.js;h=c03b6358de445ebb1169611a26b3c6d686683cf6;hp=746f5a3d76bc0af31867fc4bc41fcce9d2659ac7;hb=66ccef8a1fdd3994dd3c75dcfede668ea55f1d2e;hpb=4e4ab3be10850546063d4a4b93250ed142bb8cd2

diff --git a/0.6.x/js/06_net/01_XNetXHR.js b/0.6.x/js/06_net/01_XNetXHR.js
index 746f5a3..c03b635 100644
--- a/0.6.x/js/06_net/01_XNetXHR.js
+++ b/0.6.x/js/06_net/01_XNetXHR.js
@@ -171,7 +171,7 @@ if( X_XHR_w3c || X_XHR_msXML ){
 					postdata = obj[ 'postdata' ] || '',
 					timeout  = obj[ 'timeout' ] || 20000,
 					noCache  = obj[ 'cache' ] !== true,
-					dataType = X_XHR._dataType = obj[ 'dataType' ],
+					dataType = X_XHR._dataType = obj[ 'dataType' ], // ext が入っている
 					xDomain  = !X_URL_isSameDomain( url ),
 					isFile   = X_URL_isLocal( url ),
 					init,
@@ -204,24 +204,25 @@ if( X_XHR_w3c || X_XHR_msXML ){
 				if( raw.responseType !== undefined ){
 					switch( dataType ){
 						case '' :
+						case 'txt' :
 						case 'text' :
 						// js, css
-							raw.responseType = 'text';
+							raw.responseType = X_XHR._dataType = 'text';
 							break;
 						case 'json' : // firefox9- は moz-json
-							raw.responseType = X_UA[ 'Gecko' ] < 10 ? 'moz-json' : X_UA[ 'Gecko' ] ? dataType : ''; // Iron 37 でエラー
+							raw.responseType = X_XHR._dataType = X_UA[ 'Gecko' ] < 10 ? 'moz-json' : X_UA[ 'Gecko' ] ? dataType : ''; // Iron 37 でエラー
 							break;
 						case 'document' :
 						case 'xml' :
 						case 'html' :
 						case 'htm' :
 						// svg
-							raw.responseType = 'document';
+							raw.responseType = X_XHR._dataType = 'document';
 							break;
 						case 'blob' :
 						case 'arraybuffer' :
 						// jpeg,jpg,png,gif,mp3,ogg...
-							raw.responseType = dataType;
+							raw.responseType = X_XHR._dataType = dataType;
 							break;
 					};
 				};
@@ -472,7 +473,6 @@ if( X_XHR_w3c || X_XHR_msXML ){
 							
 							// parse json, html, xml, text, script, css
 							switch( X_XHR._dataType ){
-								case '' :
 								case 'text' :
 									data = X_Script_try( X_Object_find, [ raw, 'responseText' ] );
 									break;
@@ -485,10 +485,6 @@ if( X_XHR_w3c || X_XHR_msXML ){
 									if( X_Type_isString( data ) ) data = X_JSON_parseTrustableString( data );
 									break;
 								case 'document' :
-								case 'xml' :
-								case 'html' :
-								case 'htm' :
-								// svg, vml, xaml, xul, mxml ??
 									data = raw[ 'responseXML' ] || raw[ 'response' ] || raw[ 'responseText' ]; // とりあえず
 									break;
 								case 'blob' :