Version 0.6.161, fix X.Net & X.SilverlightAudio.

[pettanr/clientJs.git] / 0.6.x / js / 06_net / 01_XNetXHR.js

diff --git a/0.6.x/js/06_net/01_XNetXHR.js b/0.6.x/js/06_net/01_XNetXHR.js
index 7e3bfe7..1f49f10 100644 (file)
--- a/0.6.x/js/06_net/01_XNetXHR.js
+++ b/0.6.x/js/06_net/01_XNetXHR.js
@@ -431,12 +431,11 @@ X_TEMP.X_Net_XHR_params = {
                                            ( 200 <= status && status < 400 ) ||\r
                                            //status === 304 ||\r
                                            ( status === 1223 && ( status = 204 ) ) ||\r
-                                           ( X_UA[ 'Webkit' ] && status === undefined && ( status = 200 ) ) // safari: /webkit/.test(userAgent)\r
+                                           ( X_UA[ 'Webkit' ] && status === undefined ) // safari: /webkit/.test(userAgent)\r
                                                ){\r
                                                        /*\r
                                                         * opera8, safari2, khtml3 で utf8 日本語文字列の文字化け\r
                                                         */\r
-                                                       // raw.getAllResponseHeaders();\r
                                                        \r
                                                        // parse json, html, xml, text, script, css\r
                                                        switch( X_NET_XHRWrapper._dataType ){\r
@@ -465,9 +464,9 @@ X_TEMP.X_Net_XHR_params = {
                                                                        break;\r
                                                        };\r
 \r
-                                                       X_NET_XHRWrapper[ 'asyncDispatch' ]( 32, { type : X_EVENT_SUCCESS, status : status || 200, response : data, headers : headers || null } );\r
+                                                       X_NET_XHRWrapper[ 'asyncDispatch' ]( 32, { type : X_EVENT_SUCCESS, status : status || 200, response : data, 'headers' : headers || null } );\r
                                                } else {\r
-                                                       X_NET_XHRWrapper[ 'asyncDispatch' ]( 32, { type : X_EVENT_ERROR, status : raw.status || 0, 'percent' : 100, headers : headers || null } );\r
+                                                       X_NET_XHRWrapper[ 'asyncDispatch' ]( 32, { type : X_EVENT_ERROR, status : status || 400, 'headers' : headers || null } );\r
                                                };\r
                                                break;\r
                                        \r