X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F06_net%2F01_XNetXHR.js;h=f6b8357e5cf5dac6f5dad696a46570f0e7df2224;hb=1bfbfbb850a390a1c46546d445961966e4cdf063;hp=2a12df800e50c8c5fd00a312d3b5312b02d2eb0f;hpb=6127f2e265f95fdc47335a914a20be355bcd83af;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 2a12df8..f6b8357 100644
--- a/0.6.x/js/06_net/01_XNetXHR.js
+++ b/0.6.x/js/06_net/01_XNetXHR.js
@@ -1,3 +1,5 @@
+//{+xhr"XHR,XDR,MSXMLによる通信"(XMLHTTPRequest, XDomainRequest, ActiveX-MSXML を使った通信)[+net]
+
 // https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest
 // https://web.archive.org/web/20071101021832/http://web.paulownia.jp/script/ajax/xmlhttp4.html
 // https://web.archive.org/web/20091029170015/http://wiki.paulownia.jp/ajax/xmlhttprequest
@@ -42,7 +44,7 @@ TODO クライアント側にもリトライ機構を入れてみる
 
  */
 var // Opera7.6+, Safari1.2+, khtml3.?+, Gecko0.9.7+
-	// ie7&8 ではローカルリソースには ActiveX の XHR を使う
+	// 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,
@@ -73,7 +75,8 @@ var // Opera7.6+, Safari1.2+, khtml3.?+, Gecko0.9.7+
 	
 	X_Net_XHR_neverReuse  = X_UA[ 'IE' ] < 9, // ie7,8 の xhr はリユース不可。msxml はリユース可能。
 	
-	X_Net_XHR_init;
+	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 ];
@@ -115,15 +118,17 @@ if( X_Net_XHR_msXMLVer ) X[ 'XHR' ][ 'MSXML_VERSION' ] = X_Net_XHR_msXMLVer;
 if( X_Net_XHR_w3c || X_Net_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_NET_XHRWrapper = X_Class_override(
-		X_EventDispatcher(),
-		{
+	return X_NET_XHRWrapper;
+};
+
+X_TEMP.X_Net_XHR_params = {
 			
 			'_rawType'   : X_EventDispatcher_EVENT_TARGET_XHR,
-			// '_rawObject' : X_Net_XHR_w3c || X_Net_XHR_msXML,
 			
 			_isXDR       : false,
 			_isMsXML     : false,
@@ -150,7 +155,7 @@ X_TEMP.X_Net_XHR_init = function(){
 					xDomain  = !X_URL_isSameDomain( url ),
 					isFile   = X_URL_isLocal( url ),
 					init,
-					tmp;
+					tmp, p;
 
 				this._dataType = obj[ 'dataType' ];
 				
@@ -264,7 +269,7 @@ X_TEMP.X_Net_XHR_init = function(){
 					
 					for( p in headers ){
 						if( X_EMPTY_OBJECT[ p ] ) continue;
-						console.log( headers[ p ] );
+						//console.log( headers[ p ] );
 						headers[ p ] !== undefined && raw.setRequestHeader( p, headers[ p ] + '' ); // Opera8.01+, MSXML3+
 					};
 				};
@@ -409,8 +414,12 @@ X_TEMP.X_Net_XHR_init = function(){
 						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 && ( ( !X_NET_XHRWrapper._isMsXML && raw.getAllResponseHeaders ) || 3 <= X_Net_XHR_msXMLVer ) && ( headers = raw.getAllResponseHeaders() ) ){
+						if( X_NET_XHRWrapper._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 );
 						};
 						
@@ -422,12 +431,11 @@ X_TEMP.X_Net_XHR_init = function(){
 				            ( 200 <= status && status < 400 ) ||
 				            //status === 304 ||
 				            ( status === 1223 && ( status = 204 ) ) ||
-				            ( X_UA[ 'Webkit' ]  && status === undefined ) // safari: /webkit/.test(userAgent)
+				            ( X_UA[ 'Webkit' ] && status === undefined ) // safari: /webkit/.test(userAgent)
 						){
 							/*
 							 * opera8, safari2, khtml3 で utf8 日本語文字列の文字化け
 							 */
-							// raw.getAllResponseHeaders();
 							
 							// parse json, html, xml, text, script, css
 							switch( X_NET_XHRWrapper._dataType ){
@@ -456,9 +464,9 @@ X_TEMP.X_Net_XHR_init = function(){
 									break;
 							};
 
-							X_NET_XHRWrapper[ 'asyncDispatch' ]( 32, { type : X_EVENT_SUCCESS, status : status || 200, data : data, headers : headers || null } );
+							X_NET_XHRWrapper[ '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 : raw.status || 0, 'percent' : 100, headers : headers || null } );
+							X_NET_XHRWrapper[ 'asyncDispatch' ]( 32, { type : X_EVENT_ERROR, status : status || 400, 'headers' : headers || null } );
 						};
 						break;
 					
@@ -479,7 +487,7 @@ X_TEMP.X_Net_XHR_init = function(){
 					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' ]( X_EVENT_TIMEOUT );
+						X_NET_XHRWrapper[ 'asyncDispatch' ]( { type :X_EVENT_ERROR, 'timeout' : true } );
 						break;
 				};
 			},
@@ -490,7 +498,7 @@ X_TEMP.X_Net_XHR_init = function(){
 
 				if( live || raw.readyState < 3 ){
 					this._busy = false;
-					live && this[ 'asyncDispatch' ]( X_EVENT_TIMEOUT );
+					live && this[ 'asyncDispatch' ]( { type : X_EVENT_ERROR, 'timeout' : true } );
 				};
 				this._timerID = 0;
 			},
@@ -501,17 +509,11 @@ X_TEMP.X_Net_XHR_init = function(){
 					states, data;
 				live && X_NET_XHRWrapper[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : X_NET_XHRWrapper._percent, 'uploadPercent' : ( e.loaded / e.total ) } );
 			}
-		},
-		true
-	);
+		};
 	// 同期リクエストでなければならない場合, unload, beforeunload時
-	
-	return X_NET_XHRWrapper;
-};
 
 };
-
-/**
+/*
  * https://gist.github.com/mmazer/5404301
  * 
  * XmlHttpRequest's getAllResponseHeaders() method returns a string of response
@@ -524,7 +526,7 @@ X_TEMP.X_Net_XHR_init = function(){
  */
 
 function X_NET_XHR_parseResponseHeaders( headerStr ){
-	var headers = {}, headerPairs, i = 0, l, headerPair, index, key, value;
+	var headers = {}, headerPairs, i = 0, l, headerPair, index, key, val;
 	
 	if( !headerStr ) return headers;