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=dad1597c77ee1c46c78c268864ef9af7d554a3f9;hpb=8e74cf066ea48ec8cf34efb2b5e84725c10c813a;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 dad1597..f6b8357 100644
--- a/0.6.x/js/06_net/01_XNetXHR.js
+++ b/0.6.x/js/06_net/01_XNetXHR.js
@@ -155,7 +155,7 @@ X_TEMP.X_Net_XHR_params = {
 					xDomain  = !X_URL_isSameDomain( url ),
 					isFile   = X_URL_isLocal( url ),
 					init,
-					tmp;
+					tmp, p;
 
 				this._dataType = obj[ 'dataType' ];
 				
@@ -431,12 +431,11 @@ X_TEMP.X_Net_XHR_params = {
 				            ( 200 <= status && status < 400 ) ||
 				            //status === 304 ||
 				            ( status === 1223 && ( status = 204 ) ) ||
-				            ( X_UA[ 'Webkit' ] && status === undefined && ( status = 200 ) ) // 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 ){
@@ -465,9 +464,9 @@ X_TEMP.X_Net_XHR_params = {
 									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;
 					
@@ -488,7 +487,7 @@ X_TEMP.X_Net_XHR_params = {
 					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;
 				};
 			},
@@ -499,7 +498,7 @@ X_TEMP.X_Net_XHR_params = {
 
 				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;
 			},
@@ -527,7 +526,7 @@ X_TEMP.X_Net_XHR_params = {
  */
 
 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;