X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F06_net%2F01_XNetXHR.js;h=7faa80cb10025d8ce586584001ba1e588a9eef08;hb=HEAD;hp=785bcbf6f19e5b8b5d1f6571a1f0ea6560aa8bff;hpb=e28511741c97176b8ffe67bb1ea0660da37f754b;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/06_net/01_XNetXHR.js b/0.6.x/js/06_net/01_XNetXHR.js
index 785bcbf..7faa80c 100644
--- a/0.6.x/js/06_net/01_XNetXHR.js
+++ b/0.6.x/js/06_net/01_XNetXHR.js
@@ -43,54 +43,70 @@ IE8 以下で xhr の失敗率が高い問題
 http://tkengo-totoro.blogspot.jp/2011/11/iexmlhttprequest.html
 TODO クライアント側にもリトライ機構を入れてみる
 
+
+TODO xml の取得には XMLDOM を使用する
+var activex = JKL.ParseXML.HTTP.ACTIVEX_XMLHTTP;    // IXMLHttpRequest
+if ( this.method == "GET" && ! this.textmode ) {
+    // use IXMLDOMElement to accept any mime types
+    // because overrideMimeType() is not available on IE6
+    activex = JKL.ParseXML.HTTP.ACTIVEX_XMLDOM;     // IXMLDOMElement
+};
+// debug.print( "new ActiveXObject( '"+activex+"' )" );
+this.req = new ActiveXObject( activex );
+
  */
 var // Opera7.6+, Safari1.2+, khtml3.?+, Gecko0.9.7+
 	// ie9- ではローカルリソースには MSXML を使う
-	X_Net_XHR_createW3C   = window[ 'XMLHttpRequest' ] && function(){ return X_Net_XHR_w3c || ( X_Net_XHR_w3c = new XMLHttpRequest() ); },
-	X_Net_XHR_w3c         = X_Net_XHR_createW3C && X_Net_XHR_createW3C(),
-	X_Net_XHR_cors        = X_Net_XHR_w3c && X_Net_XHR_w3c.withCredentials !== undefined,
-	X_Net_XHR_progress    = X_Net_XHR_w3c && X_Net_XHR_w3c.onprogress !== undefined,
-	X_Net_XHR_upload      = X_Net_XHR_w3c && !!X_Net_XHR_w3c.upload,
+	X_XHR_createW3C   = window[ 'XMLHttpRequest' ] && function(){ return X_XHR_w3c || ( X_XHR_w3c = new XMLHttpRequest() ); },
+	X_XHR_w3c         = X_XHR_createW3C && X_XHR_createW3C(),
+	X_XHR_cors        = X_XHR_w3c && X_XHR_w3c.withCredentials !== undefined,
+	X_XHR_progress    = X_XHR_w3c && X_XHR_w3c.onprogress !== undefined,
+	X_XHR_upload      = X_XHR_w3c && !!X_XHR_w3c.upload,
 	
-	X_Net_XHR_createXDR   = window[ 'XDomainRequest' ] && function(){ return X_Net_XHR_xdr || ( X_Net_XHR_xdr = new XDomainRequest() ); },
-	X_Net_XHR_xdr         = X_Net_XHR_createXDR && X_Net_XHR_createXDR(),
+	X_XHR_createXDR   = window[ 'XDomainRequest' ] && function(){ return X_XHR_xdr || ( X_XHR_xdr = new XDomainRequest() ); },
+	X_XHR_xdr         = X_XHR_createXDR && X_XHR_createXDR(),
 
+	X_XHR_msXMLVer    = 0,
+	X_XHR_msXMLName   = '',
+	X_XHR_msXML,
+		
 	// ie11の互換モード(7,8)の msxml はいまいち動かない
-	X_Net_XHR_createMSXML = X_UA[ 'ActiveX' ] && ( X_UA[ 'IE5x' ] || X_UA[ 'IE6' ] || X_URL_IS_LOCAL ) &&
-		( new Function( 'f', [
-			'var x=".XMLHTTP",',
-				'm="MSXML2"+x,',
-				'n=[m+".6.0",m+".3.0",m+".5.0",m+".4.0",m,"Microsoft"+x],',
-				'v=[6,3,5,4,2,1],',
-				'a=ActiveXObject,',
-				'i=-1;',
-			'for(;i<5;){',
-				'try{',
-					'return f?[v[++i],new a(n[i])]:new a(n[i])',
-				'}catch(e){}',
-			'}'
-		].join( '' ) ) ),
-
-	X_Net_XHR_msXMLVer    = 0,	
-	X_Net_XHR_msXML       = X_Net_XHR_createMSXML && X_Net_XHR_createMSXML( true ),
+	X_XHR_createMSXML = X_UA[ 'ActiveX' ] && ( X_UA[ 'IE5x' ] || X_UA[ 'IE6' ] || X_URL_IS_LOCAL ) &&
+							function(){ return X_Script_createActiveXObjectSafty( X_XHR_msXMLName ); },
+
+
 	
-	X_Net_XHR_neverReuse  = X_UA[ 'IE' ] < 9 || X_UA[ 'iOS' ] || X_UA[ 'Android' ], // ie7,8 の xhr はリユース不可。msxml はリユース可能。
+	X_XHR_neverReuse  = X_UA[ 'IE' ] < 9, // ie7,8 の xhr はリユース不可。msxml はリユース可能。
 	
-	X_Net_XHR_TYPE_FLASH  = 8,
-	X_Net_XHR_TYPE_GADGET = 16;
-
-if( X_Net_XHR_msXML ){
-	X_Net_XHR_msXMLVer = X_Net_XHR_msXML[ 0 ];
-	X_Net_XHR_msXML    = X_Net_XHR_msXML[ 1 ];
-} else {
-	X_Net_XHR_createMSXML = null;
+	X_XHR_TYPE_FLASH  = 8,
+	X_XHR_TYPE_GADGET = 16;
+
+if( X_XHR_createMSXML ){
+	( function(){
+		var x = '.XMLHTTP',
+			m = 'Msxml2' + x,
+			n = [ m + '.6.0', m + '.3.0', m + '.5.0', m + '.4.0', m, 'Microsoft' + x ],
+			v = [ 6, 3, 5, 4, 2, 1 ],
+			i = -1,
+			a;
+		for( ; i < 5; ){
+			a = X_Script_createActiveXObjectSafty( n[ ++i ] );
+			if( a ){
+				X_XHR_msXMLVer  = v[ i ];
+				X_XHR_msXMLName = n[ i ];
+				X_XHR_msXML     = a;
+				return;
+			};
+		};
+		X_XHR_createMSXML = null;
+	})();
 };
 
 X[ 'XHR' ] = {
 
-	'W3C'         : X_Net_XHR_createW3C   ? 1 : 0,
-	'MSXML'       : X_Net_XHR_createMSXML ? 2 : 0,
-	'XDR'         : X_Net_XHR_createXDR   ? 4 : 0,
+	'W3C'         : X_XHR_createW3C   ? 1 : 0,
+	'MSXML'       : X_XHR_createMSXML ? 2 : 0,
+	'XDR'         : X_XHR_createXDR   ? 4 : 0,
 
 /*
  * http://hakuhin.jp/as/import.html
@@ -98,7 +114,7 @@ X[ 'XHR' ] = {
  * http://hakuhin.jp/as/javascript.html
  * Flash から JavaScript にアクセスする(3+)
  */
-	'FLASH'       : X_Pulgin_FLASH_ENABLED && 4 <= X_Pulgin_FLASH_VERSION ? 8 : 0,
+	'FLASH'       : 4 <= X_Plugin_FLASH_VERSION ? 8 : 0,
 	
 	'GADGET'      : 5.5 <= X_UA[ 'IE' ] || !X_UA[ 'IE' ] ? 16 : 0,
 
@@ -106,30 +122,30 @@ X[ 'XHR' ] = {
  * https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest
  * Progress Events 	Chrome7, firefox3.5, ie10, opera12, Safari?, Chrome for Android 0.16
  */
-	'PROGRESS'        : X_Net_XHR_progress,
+	'PROGRESS'        : X_XHR_progress,
 
-	'UPLOAD_PROGRESS' : X_Net_XHR_upload,
+	'UPLOAD_PROGRESS' : X_XHR_upload,
 
 	// or gadget proxy or flash
-	'CORS'            : X_Net_XHR_xdr || X_Net_XHR_cors,
+	'CORS'            : X_XHR_xdr || X_XHR_cors,
 	
-	'BINARY'          : X_Pulgin_VBS_ENABLED
+	'BINARY'          : X_Script_VBS_ENABLED
 };
 
-if( X_Net_XHR_msXMLVer ) X[ 'XHR' ][ 'MSXML_VERSION' ] = X_Net_XHR_msXMLVer;
+if( X_XHR_msXMLVer ) X[ 'XHR' ][ 'MSXML_VERSION' ] = X_XHR_msXMLVer;
 
-if( X_Net_XHR_w3c || X_Net_XHR_msXML ){
+if( X_XHR_w3c || X_XHR_msXML ){
 
-X_TEMP.X_Net_XHR_init = function(){
-	X_NET_XHRWrapper = X_Class_override( X_EventDispatcher(), X_TEMP.X_Net_XHR_params, true );
-	
-	delete X_TEMP.X_Net_XHR_init;
-	delete X_TEMP.X_Net_XHR_params;	
+	X_TEMP.X_XHR_init = function(){
+		X_XHR = X_Class_override( X_EventDispatcher(), X_TEMP.X_XHR_params, true );
+		
+		delete X_TEMP.X_XHR_init;
+		delete X_TEMP.X_XHR_params;	
+		
+		return X_XHR;
+	};
 	
-	return X_NET_XHRWrapper;
-};
-
-X_TEMP.X_Net_XHR_params = {
+	X_TEMP.X_XHR_params = {
 			
 			'_rawType'   : X_EventDispatcher_EVENT_TARGET_XHR,
 			
@@ -145,7 +161,7 @@ X_TEMP.X_Net_XHR_params = {
 			_timerID     : 0,
 			
 			load : function( obj ){
-				var raw      = this[ '_rawObject' ],
+				var raw      = X_XHR[ '_rawObject' ],
 					method   = obj[ 'method' ],
 					url      = obj[ 'url' ],
 					async    = obj[ 'async' ] !== false,
@@ -155,101 +171,107 @@ X_TEMP.X_Net_XHR_params = {
 					postdata = obj[ 'postdata' ] || '',
 					timeout  = obj[ 'timeout' ] || 20000,
 					noCache  = obj[ 'cache' ] !== true,
+					dataType = X_XHR._dataType = obj[ 'dataType' ], // 明示され無い場合、ext が入っている
 					xDomain  = !X_URL_isSameDomain( url ),
 					isFile   = X_URL_isLocal( url ),
 					init,
-					tmp, p;
-
-				this._dataType = obj[ 'dataType' ];
+					type, tmp, p;
 				
-				if( !raw || xDomain !== this._isXDR || ( X_Net_XHR_createMSXML && isFile !== this._isMsXML ) ){
-					raw && this[ 'unlisten' ]( [ 'load', 'readystatechange', 'progress', 'error', 'timeout' ] );
+				if( !raw || xDomain !== X_XHR._isXDR || ( X_XHR_createMSXML && isFile !== X_XHR._isMsXML ) ){
+					raw && X_XHR[ 'unlisten' ]( [ 'load', 'readystatechange', 'progress', 'error', 'timeout' ] );
 					init = true;
-					this[ '_rawObject' ] = raw = xDomain ?
-													( X_Net_XHR_cors ?
-														X_Net_XHR_createW3C() :
-														X_Net_XHR_createXDR()
+					X_XHR[ '_rawObject' ] = raw = xDomain ?
+													( X_XHR_cors ?
+														X_XHR_createW3C() :
+														X_XHR_createXDR()
 													) :
 												 isFile ?
-												 	( X_Net_XHR_createMSXML ?
-														( X_Net_XHR_msXML = X_Net_XHR_msXML || X_Net_XHR_createMSXML() ):
-														X_Net_XHR_createW3C()
+												 	( X_XHR_createMSXML ?
+														( X_XHR_msXML = X_XHR_msXML || X_XHR_createMSXML() ):
+														X_XHR_createW3C()
 													 ) :
-												 X_Net_XHR_createW3C ?
-													X_Net_XHR_createW3C() :
-													( X_Net_XHR_msXML = X_Net_XHR_msXML || X_Net_XHR_createMSXML() );
+												 X_XHR_createW3C ?
+													X_XHR_createW3C() :
+													( X_XHR_msXML = X_XHR_msXML || X_XHR_createMSXML() );
 
 					// raw === XDR これは　error になるのでフラグに控える
-					this._isXDR   = X_Net_XHR_createXDR && xDomain;
-					this._isMsXML = !X_Net_XHR_createW3C || ( isFile && X_Net_XHR_createMSXML );
+					X_XHR._isXDR   = X_XHR_createXDR && xDomain;
+					X_XHR._isMsXML = !X_XHR_createW3C || ( isFile && X_XHR_createMSXML );
 				};
 				
 				raw.open( method, url, async, username, password );
 				
 				if( raw.responseType !== undefined ){
-					switch( this._dataType ){
+					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' ] ? this._dataType : ''; // Iron 37 でエラー
+							raw.responseType = X_UA[ 'Gecko' ] < 10 ? 'moz-json' : X_UA[ 'Gecko' ] ? dataType : ''; // Iron 37 でエラー
+							X_XHR._dataType  = 'json';
 							break;
 						case 'document' :
 						case 'xml' :
 						case 'html' :
 						case 'htm' :
-						// svg
-							raw.responseType = 'document';
+						case 'svg' :
+						case 'vml' :
+							raw.responseType = X_XHR._dataType = 'document';
 							break;
 						case 'blob' :
 						case 'arraybuffer' :
 						// jpeg,jpg,png,gif,mp3,ogg...
-							raw.responseType = this._dataType;
+							raw.responseType = X_XHR._dataType = dataType;
 							break;
 					};
 				};
 				
 				// http://www.quirksmode.org/blog/archives/2005/09/xmlhttp_notes_r_1.html
-				if( !this._isMsXML && raw.overrideMimeType ){	
-					switch( X_URL_getEXT( url ) || this._dataType ){
+				if( !X_XHR._isMsXML && raw.overrideMimeType ){
+					switch( type = dataType ){
+						case 'document' :
+						case 'xml' :
 						case 'html' :
 						case 'htm' :
-						case 'xml' :
+						case 'svg' :
+						case 'vml' :
 							tmp = 'text/xml';
 							break;
 						case 'json' :
-							tmp = 'application/json'; // 2015.6.29
+							tmp = 'application/json';
 							break;
-
 						case 'mp3' :
-							tmp = 'audio/mpeg';
-							break;
+							tmp = 'mpeg';	
+						case 'weba' :
+							tmp = tmp || 'webm';			
 						case 'opus' :
-						case 'ogg' :
-							tmp = 'audio/ogg';
-							break;
-						case 'wav' :
-							tmp = 'audio/wav';
-							break;							
+							tmp = tmp || 'ogg';
+						case 'ogg' :	
+						case 'wav' :						
 						case 'aac' :
-							tmp = 'audio/aac';
+							tmp = 'audio/' + ( tmp || type );
 							break;
 						case 'm4a' :
-							tmp = 'audio/x-m4a"';
-							break;	
 						case 'mp4' :
-							tmp = 'audio/x-mp4';
-							break;	
-						case 'weba' :
-							tmp = 'audio/webm';
+							tmp = 'audio/x-' + type;
+							break;
+						case 'jpeg' :
+						case 'jpg' :
+						case 'png' :
+						case 'gif' :
+						case 'bmp' :
+						case 'ico' :
+							tmp = 'text/plain; charset=x-user-defined';
 							break;
+							
 					};
-					if( tmp = obj[ 'mimeType' ] || tmp ) raw.overrideMimeType( tmp );
+					if( obj[ 'mimeType' ] || tmp ) raw.overrideMimeType( obj[ 'mimeType' ] || tmp );
 				};
 
-				if( !this._isXDR && ( this._isMsXML ? 3 <= X_Net_XHR_msXMLVer : raw.setRequestHeader ) ){ // msxml は setRequestHeader getter がいけない
+				if( !X_XHR._isXDR && ( X_XHR._isMsXML ? 3 <= X_XHR_msXMLVer : raw.setRequestHeader ) ){ // msxml は setRequestHeader getter がいけない
 					
 					/*
 					if( noCache ){
@@ -257,11 +279,10 @@ X_TEMP.X_Net_XHR_params = {
 						headers[ 'Cache-Control' ] = 'no-cache';
 						headers[ 'If-Modified-Since' ] = 'Thu, 01 Jun 1970 00:00:00 GMT';
 					} */
-		
-					// http://nakigao.sitemix.jp/blog/?p=2040
-					// json 取得時に SafariでHTTP/412のエラー。但し相手が audio の場合この指定があるとロードに失敗する。 iOS8.2, iOS7.1 では遭遇せず
-					if( this._dataType === 'json' ){
-						headers[ 'If-Modified-Since' ] = ( new Date ).toUTCString();
+
+					// http://8note.phpapps.jp/jquery-ajax%E3%81%A7%E3%81%AE412%E3%82%A8%E3%83%A9%E3%83%BC/
+					if( dataType === 'json' && X_UA[ 'Safari' ] ){
+						headers[ 'If-Modified-Since' ] = 'Thu, 01 Jun 1970 00:00:00 GMT';
 					};
 					
 					// http://boscono.hatenablog.com/entry/2013/12/23/152851
@@ -275,65 +296,64 @@ X_TEMP.X_Net_XHR_params = {
 
 					
 					for( p in headers ){
-						if( X_EMPTY_OBJECT[ p ] ) continue;
+						//if( X_EMPTY_OBJECT[ p ] ) continue;
 						//console.log( headers[ p ] );
 						headers[ p ] !== undefined && raw.setRequestHeader( p, headers[ p ] + '' ); // Opera8.01+, MSXML3+
 					};
 				};
 				
-				if( !this._isMsXML && raw.timeout !== undefined ){
+				if( !X_XHR._isMsXML && raw.timeout !== undefined ){
 					raw.timeout = timeout;
 				} else {
-					this._timerID = X_Timer_once( timeout, this, this.onTimeout );
+					X_XHR._timerID = X_Timer_once( timeout, X_XHR.onTimeout );
 				};	
 				
 				// send 前にフラグを立てる,回線が早いと raw.send() 内で onload -> _busy = false ののち、 _busy = true するため。
-				this._busy = true;
+				X_XHR._busy = true;
 
 				raw.send( X_Type_isString( postdata ) ? postdata : X_String_serialize( postdata ) );
 
 				if( !async || raw.readyState === 4 ){
-					X_Timer_once( 32, this, this.handleEvent, [ { type : 'readystatechange' } ] );
+					X_Timer_once( 32, X_XHR, [ { type : 'readystatechange' } ] );
 				} else
 				if( init ){
-					if( this._isMsXML ){
-						raw[ 'onreadystatechange' ] = X_NET_XHRWrapper.handleEvent;
+					if( X_XHR._isMsXML ){
+						raw[ 'onreadystatechange' ] = X_XHR.handleEvent;
 					} else
-					if( X_Net_XHR_progress || this._isXDR ){
-						this[ 'listen' ]( [ 'load', 'progress', 'error', 'timeout' ] ); //, 'abort'
+					if( X_XHR_progress || X_XHR._isXDR ){
+						X_XHR[ 'listen' ]( [ 'load', 'progress', 'error', 'timeout' ] ); //, 'abort'
 					} else
 					if( X_UA[ 'IE8' ] ){
-						this[ 'listen' ]( [ 'readystatechange', 'error', 'timeout' ] );
+						X_XHR[ 'listen' ]( [ 'readystatechange', 'error', 'timeout' ] );
 					} else
 					if( X_UA[ 'IE7' ] ){
-						this[ 'listen' ]( [ 'readystatechange', 'error' ] );
-					
+						X_XHR[ 'listen' ]( [ 'readystatechange', 'error' ] );
 					} else {
-						this[ 'listen' ]( [ 'load', 'readystatechange', 'error', 'timeout' ] ); //, 'abort'
+						X_XHR[ 'listen' ]( [ 'load', 'readystatechange', 'error', 'timeout' ] ); //, 'abort'
 					};
 				
-					if( X_Net_XHR_upload ){
-						raw.upload.addEventListener( 'progress', this.onUploadProgress );
+					if( X_XHR_upload ){
+						raw.upload.addEventListener( 'progress', X_XHR.onUploadProgress );
 					};
 				};
 			},
 			
 			cancel : function(){
-				/* this[ '_rawObject' ].abort && */ this[ '_rawObject' ].abort();
-				this._canceled = true;
+				/* X_XHR[ '_rawObject' ].abort && */ X_XHR[ '_rawObject' ].abort();
+				X_XHR._canceled = true;
 			},
 			
 			reset : function(){
 				
-				this._method   = this._dataType = '';
-				this._canceled = this._busy = this._error = false;
-				this._timerID && X_Timer_remove( this._timerID );
-				this._percent  = this._timerID = 0;
+				X_XHR._method   = X_XHR._dataType = '';
+				X_XHR._canceled = X_XHR._busy = X_XHR._error = false;
+				X_XHR._timerID && X_Timer_remove( X_XHR._timerID );
+				X_XHR._percent  = X_XHR._timerID = 0;
 				
 				// XMLHttpRequest の使い方
 				// http://webos-goodies.jp/archives/50548720.html
 				// XMLHttpRequest オブジェクトを再利用する際も、 abort メソッドを呼び出す必要があるようです。
-				/* this[ '_rawObject' ].abort && */ this[ '_rawObject' ].abort();	
+				/* X_XHR[ '_rawObject' ].abort && */ X_XHR[ '_rawObject' ].abort();	
 				
 				// XMLHttpRequest で順番にリソースを取得する
 				// http://note.chiebukuro.yahoo.co.jp/detail/n16248
@@ -346,33 +366,33 @@ X_TEMP.X_Net_XHR_params = {
 				
 				// Timeout した Gecko の xhr.response に触るとエラー??
 
-				if( this._error || ( X_Net_XHR_neverReuse && !this._isMsXML ) ){
+				if( X_XHR._error || ( X_XHR_neverReuse && !X_XHR._isMsXML ) ){
 					
-					if( X_Net_XHR_upload ){
-						X_Net_XHR_w3c.upload.removeEventListener( 'progress', this.onUploadProgress );
+					if( X_XHR_upload ){
+						X_XHR_w3c.upload.removeEventListener( 'progress', X_XHR.onUploadProgress );
 					};
 
 					// ie7 は xhr object を再利用できない。但し send のあとに alert を挟むと動いた、、、
 					// ie7モード(IE11) では再利用可能、、、
 										
-					X_EventDispatcher_toggleAllEvents( this, false );
-					this[ '_rawObject' ] = null;
+					X_EventDispatcher_toggleAllEvents( X_XHR, false );
+					X_XHR[ '_rawObject' ] = null;
 					
-					if( this._isXDR ){
-						X_Net_XHR_xdr   = null;
-						delete this._isXDR;
+					if( X_XHR._isXDR ){
+						X_XHR_xdr   = null;
+						delete X_XHR._isXDR;
 					} else {
-						X_Net_XHR_w3c   = null;
+						X_XHR_w3c   = null;
 					};				
 
-					this[ 'unlisten' ]( [ 'load', 'readystatechange', 'progress', 'error', 'timeout' ] );
+					X_XHR[ 'unlisten' ]( [ 'load', 'readystatechange', 'progress', 'error', 'timeout' ] );
 				};
 			},
 			
 			handleEvent : function( e ){
-				var raw  = X_NET_XHRWrapper[ '_rawObject' ],
-					live = !X_NET_XHRWrapper._canceled,
-					headers, status, data;
+				var raw  = X_XHR[ '_rawObject' ],
+					live = !X_XHR._canceled,
+					headers, status, text, data;
 
 				switch( e && e.type || 'readystatechange' ){
 					/*
@@ -383,7 +403,7 @@ X_TEMP.X_Net_XHR_params = {
 					2: リクエストを受信した
 					3: リクエストの処理中
 					4: リクエストは終了してレスポンスの準備が完了
-					status 	200: "OK"
+					status 	200: 'OK'
 					404: Page not found
 					
 					If-Modified-Sinceヘッダを利用してWebページのキャッシュを行うXMLHttpRequestラッパー
@@ -396,14 +416,14 @@ X_TEMP.X_Net_XHR_params = {
 								case 1 :
 									return;
 								case 2 : // 0% ajaxstart
-									live && X_NET_XHRWrapper[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : 0 } );
+									live && X_XHR[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : 0 } );
 									return;
 								case 3 :
-									live && X_NET_XHRWrapper[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : X_NET_XHRWrapper._percent < 99.9 ? 99.9 : ( X_NET_XHRWrapper._percent + 100 ) / 2 } );
+									live && X_XHR[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : X_XHR._percent < 99.9 ? 99.9 : ( X_XHR._percent + 100 ) / 2 } );
 									// 99.9%
 									return;
 								case 4 :
-									if( X_NET_XHRWrapper._percent === 100 ) return; // Opera8 readystatechange が2重に発生
+									if( X_XHR._percent === 100 ) return; // Opera8 readystatechange が2重に発生
 									// 100%
 									break; // load へ
 								default :
@@ -414,20 +434,20 @@ X_TEMP.X_Net_XHR_params = {
 	
 					case 'load' :
 
-						if( !X_NET_XHRWrapper._busy ) return;
+						if( !X_XHR._busy ) return;
 						
-						X_NET_XHRWrapper._percent = 100;
-						X_NET_XHRWrapper._busy    = false;
+						X_XHR._percent = 100;
+						X_XHR._busy    = false;
 						status        = raw.status;
 						
 						// TODO GET_FULL_HEADERS
 						// https://msdn.microsoft.com/en-us/library/ms766595%28v=vs.85%29.aspx
 						// Implemented in: MSXML 3.0 and MSXML 6.0
-						if( X_NET_XHRWrapper._isXDR ){
+						if( X_XHR._isXDR ){
 							headers = { 'Content-Type' : raw.contentType };
 						} else
-						if( ( X_NET_XHRWrapper._isMsXML ? 3 <= X_Net_XHR_msXMLVer : raw.setRequestHeader ) && ( headers = raw.getAllResponseHeaders() ) ){
-							headers = X_NET_XHR_parseResponseHeaders( headers );
+						if( ( X_XHR._isMsXML ? 3 <= X_XHR_msXMLVer : raw.setRequestHeader ) && ( headers = raw.getAllResponseHeaders() ) ){
+							headers = X_XHR_parseResponseHeaders( headers );
 						};
 						
 						// https://code.google.com/p/fakeworker-js/source/browse/src/javascript/fakeworker.js
@@ -442,84 +462,111 @@ X_TEMP.X_Net_XHR_params = {
 						){
 							/*
 							 * opera8, safari2, khtml3 で utf8 日本語文字列の文字化け
+							 * 
+							 * http://www.kawa.net/works/js/jkl/parsexml.html
+							
+							text = raw[ 'responseText' ];
+						    //  Safari and Konqueror cannot understand the encoding of text files.
+						    if( text && ( X_UA[ 'Webkit' ] < 420 || X_UA[ 'KHTML' ] < 4 ) ){
+						        text = escape( text );
+						        if ( !text.match( '%u' ) && esc.match( '%' ) ){
+						            text = decodeURIComponent( text );
+						        };
+						    };
 							 */
 							
 							// parse json, html, xml, text, script, css
-							switch( X_NET_XHRWrapper._dataType ){
-								case '' :
+							switch( X_XHR._dataType ){
 								case 'text' :
-									data = raw[ 'responseText' ];
+									data = X_Script_try( X_Object_find, [ raw, 'responseText' ] );
 									break;
 								case 'json' :
-								case 'moz-json' :
-									data = raw[ 'response' ] || raw[ 'responseText' ];
+									data = X_Script_try( X_Object_find, [ raw, 'response' ] ) || X_Script_try( X_Object_find, [ raw, 'responseText' ] );
 									// eval() を使っているけど JSON の無いブラウザは XDomain な XHR はできないのでよしとする。
 									// XDomain な XHR の際は Flash 等で代替し、その中に Json parser も組み込む。
 									// http://d.hatena.ne.jp/sshi/20060904/p1
-									if( !X_Type_isObject( data ) ) data = X_JSON_parseTrustableString( data );
+									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' :
 								case 'arraybuffer' :
+									// TODO resoponceBody if( X_UA[ 'IE' ] < 10 )
+									// http://d.hatena.ne.jp/maachang/20130221/1361427565
 									data = raw[ 'response' ] || raw[ 'responseText' ]; // とりあえず
 									break;
 							};
-							X_NET_XHRWrapper[ 'asyncDispatch' ]( 32, { type : X_EVENT_SUCCESS, status : status || 200, response : data, 'headers' : headers || null } );
+						};
+						
+						if( data ){
+							X_XHR[ 'asyncDispatch' ]( 32, { type : X_EVENT_SUCCESS, status : status || 200, response : data, 'headers' : headers || null } );
 						} else {
-							X_NET_XHRWrapper[ 'asyncDispatch' ]( 32, { type : X_EVENT_ERROR, status : status || 400, 'headers' : headers || null } );
+							X_XHR[ 'asyncDispatch' ]( 32, { type : X_EVENT_ERROR, status : status || 400, 'headers' : headers || null } );
 						};
 						break;
 					
 					case 'progress' :
 						if( e.lengthComputable ){
-							X_NET_XHRWrapper._percent = e.loaded / e.total * 100;
-							live && X_NET_XHRWrapper._percent < 100 && X_NET_XHRWrapper[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : X_NET_XHRWrapper._percent } );
+							X_XHR._percent = e.loaded / e.total * 100;
+							live && X_XHR._percent < 100 && X_XHR[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : X_XHR._percent } );
 						};
 						break;
 					
 					case 'error' :
 					//console.dir( e );
-						X_NET_XHRWrapper._busy  = false;
-						X_NET_XHRWrapper._error = X_UA[ 'Opera' ] || X_UA[ 'Webkit' ] ;
-						live && X_NET_XHRWrapper[ 'asyncDispatch' ]( 32, { type : X_EVENT_ERROR, status : raw.status } );
+						X_XHR._busy  = false;
+						X_XHR._error = X_UA[ 'Opera' ] || X_UA[ 'Webkit' ] ;
+						live && X_XHR[ 'asyncDispatch' ]( 32, { type : X_EVENT_ERROR, status : raw.status } );
 						break;
 
 					case 'timeout' : // Gecko 12.0 https://developer.mozilla.org/ja/docs/XMLHttpRequest/Synchronous_and_Asynchronous_Requests
-						X_NET_XHRWrapper._busy  = false;
-						X_NET_XHRWrapper._error = !!X_UA[ 'Gecko' ];
-						X_NET_XHRWrapper[ 'asyncDispatch' ]( { type :X_EVENT_ERROR, 'timeout' : true, status : 408 } );
+						X_XHR._busy  = false;
+						X_XHR._error = !!X_UA[ 'Gecko' ];
+						X_XHR[ 'asyncDispatch' ]( { type : X_EVENT_ERROR, 'timeout' : true, status : 408 } );
 						break;
 				};
 			},
-			
+
+/*
+ * http://www.kawa.net/works/js/jkl/parsexml.html
+ * 
+// ================================================================
+//  method: documentElement()
+//  return: XML DOM in response body
+
+JKL.ParseXML.HTTP.prototype.documentElement = function() {
+    // debug.print( 'documentElement: '+this.req );
+    if ( ! this.req ) return;
+    if ( this.req.responseXML ) {
+        return this.req.responseXML.documentElement;    // XMLHTTPRequest
+    } else {
+        return this.req.documentElement;                // IXMLDOMDocument
+    }
+};
+ */
+		
 			onTimeout : function(){
-				var raw  = this[ '_rawObject' ],
-					live = !X_NET_XHRWrapper._canceled || !this._busy;
+				var raw  = X_XHR[ '_rawObject' ],
+					live = !X_XHR._canceled || !X_XHR._busy;
 
 				if( live || raw.readyState < 3 ){
-					this._busy = false;
-					live && this[ 'asyncDispatch' ]( { type : X_EVENT_ERROR, 'timeout' : true, status : 408 } );
+					X_XHR._busy = false;
+					live && X_XHR[ 'asyncDispatch' ]( { type : X_EVENT_ERROR, 'timeout' : true, status : 408 } );
 				};
-				this._timerID = 0;
+				X_XHR._timerID = 0;
 			},
 			
-			onUploadProgress : X_Net_XHR_upload && function( e ){
-				!X_NET_XHRWrapper._canceled &&
-					X_NET_XHRWrapper[ 'asyncDispatch' ]( {
+			onUploadProgress : X_XHR_upload && function( e ){
+				!X_XHR._canceled &&
+					X_XHR[ 'asyncDispatch' ]( {
 						type            : X_EVENT_PROGRESS,
-						'percent'       : X_NET_XHRWrapper._percent,
+						'percent'       : X_XHR._percent,
 						'uploadPercent' : e.loaded / e.total * 100
 					} );
 			}
 		};
 	// 同期リクエストでなければならない場合, unload, beforeunload時
-
 };
 /*
  * https://gist.github.com/mmazer/5404301
@@ -533,7 +580,7 @@ X_TEMP.X_Net_XHR_params = {
  * 複数の情報が存在する場合、改行で区切られています。
  */
 
-function X_NET_XHR_parseResponseHeaders( headerStr ){
+function X_XHR_parseResponseHeaders( headerStr ){
 	var headers = {}, headerPairs, i = 0, l, headerPair, index, key, val;
 	
 	if( !headerStr ) return headers;