OSDN Git Service

Version 0.6.153, fix layout @X.UI.
[pettanr/clientJs.git] / 0.6.x / js / 06_net / 01_XNetXHR.js
index 2a12df8..efe8c94 100644 (file)
@@ -409,8 +409,12 @@ X_TEMP.X_Net_XHR_init = function(){
                                                status        = raw.status;\r
                                                \r
                                                // TODO GET_FULL_HEADERS\r
+                                               // https://msdn.microsoft.com/en-us/library/ms766595%28v=vs.85%29.aspx\r
                                                // Implemented in: MSXML 3.0 and MSXML 6.0\r
-                                               if( !X_NET_XHRWrapper._isXDR && ( ( !X_NET_XHRWrapper._isMsXML && raw.getAllResponseHeaders ) || 3 <= X_Net_XHR_msXMLVer ) && ( headers = raw.getAllResponseHeaders() ) ){\r
+                                               if( X_NET_XHRWrapper._isXDR ){\r
+                                                       headers = { 'Content-Type' : raw.contentType };\r
+                                               } else\r
+                                               if( ( X_NET_XHRWrapper._isMsXML ? 3 <= X_Net_XHR_msXMLVer : raw.setRequestHeader ) && ( headers = raw.getAllResponseHeaders() ) ){\r
                                                        headers = X_NET_XHR_parseResponseHeaders( headers );\r
                                                };\r
                                                \r
@@ -422,7 +426,7 @@ X_TEMP.X_Net_XHR_init = function(){
                                            ( 200 <= status && status < 400 ) ||\r
                                            //status === 304 ||\r
                                            ( status === 1223 && ( status = 204 ) ) ||\r
-                                           ( X_UA[ 'Webkit' ]  && status === undefined ) // safari: /webkit/.test(userAgent)\r
+                                           ( X_UA[ 'Webkit' ] && status === undefined && ( status = 200 ) ) // safari: /webkit/.test(userAgent)\r
                                                ){\r
                                                        /*\r
                                                         * opera8, safari2, khtml3 で utf8 日本語文字列の文字化け\r
@@ -511,7 +515,7 @@ X_TEMP.X_Net_XHR_init = function(){
 \r
 };\r
 \r
-/**\r
+/*\r
  * https://gist.github.com/mmazer/5404301\r
  * \r
  * XmlHttpRequest's getAllResponseHeaders() method returns a string of response\r