X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=0.6.x%2Fjs%2F06_net%2F01_XNetXHR.js;h=13ee2f9c2338aadd73cd1613f190099fed1a7bcf;hb=9e04e2a1221a92960a74e550bc3fd809caf3cd1c;hp=0094a05fc3b54ded430d615463dc0ba3c5f6acb5;hpb=527f50d3e1930a335a6525b5c973ab27fe385868;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 0094a05..13ee2f9 100644
--- a/0.6.x/js/06_net/01_XNetXHR.js
+++ b/0.6.x/js/06_net/01_XNetXHR.js
@@ -171,12 +171,11 @@ if( X_XHR_w3c || X_XHR_msXML ){
 					postdata = obj[ 'postdata' ] || '',
 					timeout  = obj[ 'timeout' ] || 20000,
 					noCache  = obj[ 'cache' ] !== true,
+					dataType = X_XHR._dataType = obj[ 'dataType' ],
 					xDomain  = !X_URL_isSameDomain( url ),
 					isFile   = X_URL_isLocal( url ),
 					init,
 					type, tmp, p;
-
-				X_XHR._dataType = obj[ 'dataType' ];
 				
 				if( !raw || xDomain !== X_XHR._isXDR || ( X_XHR_createMSXML && isFile !== X_XHR._isMsXML ) ){
 					raw && X_XHR[ 'unlisten' ]( [ 'load', 'readystatechange', 'progress', 'error', 'timeout' ] );
@@ -203,14 +202,14 @@ if( X_XHR_w3c || X_XHR_msXML ){
 				raw.open( method, url, async, username, password );
 				
 				if( raw.responseType !== undefined ){
-					switch( X_XHR._dataType ){
+					switch( dataType ){
 						case '' :
 						case 'text' :
 						// js, css
 							raw.responseType = 'text';
 							break;
 						case 'json' : // firefox9- は moz-json
-							raw.responseType = X_UA[ 'Gecko' ] < 10 ? 'moz-json' : X_UA[ 'Gecko' ] ? X_XHR._dataType : ''; // Iron 37 でエラー
+							raw.responseType = X_UA[ 'Gecko' ] < 10 ? 'moz-json' : X_UA[ 'Gecko' ] ? dataType : ''; // Iron 37 でエラー
 							break;
 						case 'document' :
 						case 'xml' :
@@ -222,14 +221,14 @@ if( X_XHR_w3c || X_XHR_msXML ){
 						case 'blob' :
 						case 'arraybuffer' :
 						// jpeg,jpg,png,gif,mp3,ogg...
-							raw.responseType = X_XHR._dataType;
+							raw.responseType = dataType;
 							break;
 					};
 				};
 				
 				// http://www.quirksmode.org/blog/archives/2005/09/xmlhttp_notes_r_1.html
 				if( !X_XHR._isMsXML && raw.overrideMimeType ){
-					type = X_URL_getEXT( url ) || X_XHR._dataType;
+					type = X_URL_getEXT( url ) || dataType;
 					switch( type ){
 						case 'html' :
 						case 'htm' :
@@ -254,6 +253,15 @@ if( X_XHR_w3c || X_XHR_msXML ){
 						case 'mp4' :
 							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 );
 				};
@@ -269,7 +277,7 @@ if( X_XHR_w3c || X_XHR_msXML ){
 		
 					// http://nakigao.sitemix.jp/blog/?p=2040
 					// json 取得時に SafariでHTTP/412のエラー。但し相手が audio の場合この指定があるとロードに失敗する。 iOS8.2, iOS7.1 では遭遇せず
-					if( X_XHR._dataType === 'json' ){
+					if( dataType === 'json' ){
 						headers[ 'If-Modified-Since' ] = ( new Date ).toUTCString();
 					};
 					
@@ -380,7 +388,7 @@ if( X_XHR_w3c || X_XHR_msXML ){
 			handleEvent : function( e ){
 				var raw  = X_XHR[ '_rawObject' ],
 					live = !X_XHR._canceled,
-					headers, status, data;
+					headers, status, text, data;
 
 				switch( e && e.type || 'readystatechange' ){
 					/*
@@ -450,6 +458,17 @@ if( X_XHR_w3c || X_XHR_msXML ){
 						){
 							/*
 							 * 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
@@ -475,6 +494,8 @@ if( X_XHR_w3c || X_XHR_msXML ){
 									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;
 							};
@@ -522,26 +543,6 @@ JKL.ParseXML.HTTP.prototype.documentElement = function() {
         return this.req.documentElement;                // IXMLDOMDocument
     }
 };
-
-// ================================================================
-//  method: responseText()
-//  return: text string in response body
-
-JKL.ParseXML.HTTP.prototype.responseText = function() {
-    // debug.print( "responseText: "+this.req );
-    if ( ! this.req ) return;
-
-    //  Safari and Konqueror cannot understand the encoding of text files.
-    if ( navigator.appVersion.match( "KHTML" ) ) {
-        var esc = escape( this.req.responseText );
-//        debug.print( "escape: "+esc );
-        if ( ! esc.match("%u") && esc.match("%") ) {
-            return decodeURIComponent(esc);
-        }
-    }
-
-    return this.req.responseText;
-};
  */
 		
 			onTimeout : function(){