Version 0.6.137, bugfix for X.NodeSelector.

[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 6a570fc..4ca0b62 100644 (file)
--- a/0.6.x/js/06_net/01_XNetXHR.js
+++ b/0.6.x/js/06_net/01_XNetXHR.js
@@ -101,16 +101,9 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
                                        headers  = obj[ 'headers' ] || {},\r
                                        postbody = obj[ 'postbody' ],\r
                                        timeout  = obj[ 'timeout' ] || 20000,\r
-                                       temp;\r
+                                       tmp;\r
                                \r
-                               if( obj[ 'type' ] ){\r
-                                       this._type = obj[ 'type' ];\r
-                               } else {\r
-                                       temp = X_URL_cleanup( url ).split( '.' );\r
-                                       if( 2 <= temp.length ){\r
-                                               this._type = temp[ temp.length - 1 ].toLowerCase();\r
-                                       };\r
-                               };\r
+                               this._type = obj[ 'type' ] || X_URL_getEXT( url );\r
                                \r
                                if( X_Net_XHR_X_DOMAIN ){\r
                                        if( X_URL_isSameDomain( url ) ){ // isXDomain\r
@@ -159,12 +152,46 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
                                };\r
                                \r
                                // http://www.quirksmode.org/blog/archives/2005/09/xmlhttp_notes_r_1.html\r
-                               // raw.overrideMimeType()\r
+                               if( !X_Net_XHR_ACTIVE_X && X_Type_isFunction( raw.overrideMimeType ) ){\r
+                                       switch( X_URL_getEXT( url ) ){\r
+                                               case 'html' :\r
+                                               case 'xml' :\r
+                                                       tmp = 'text/xml';\r
+                                                       break;\r
+\r
+                                               case 'mp3' :\r
+                                                       tmp = 'audio/mpeg';\r
+                                                       break;\r
+                                               case 'opus' :\r
+                                               case 'ogg' :\r
+                                                       tmp = 'audio/ogg';\r
+                                                       break;\r
+                                               case 'wav' :\r
+                                                       tmp = 'audio/wav';\r
+                                                       break;                                                  \r
+                                               case 'aac' :\r
+                                                       tmp = 'audio/aac';\r
+                                                       break;\r
+                                               case 'm4a' :\r
+                                                       tmp = 'audio/x-m4a"';\r
+                                                       break;  \r
+                                               case 'mp4' :\r
+                                                       tmp = 'audio/x-mp4';\r
+                                                       break;  \r
+                                               case 'weba' :\r
+                                                       tmp = 'audio/webm';\r
+                                                       break;\r
+                                       };\r
+                                       if( obj[ 'mimeType' ] || tmp ) raw.overrideMimeType( obj[ 'mimeType' ] || tmp );\r
+                                       console.log( this._type );\r
+                                       console.log( obj[ 'mimeType' ] || tmp );\r
+                               };\r
+\r
                                if( !X_Net_XHR_ACTIVE_X && X_Type_isFunction( raw.setRequestHeader ) ){\r
                                        \r
                                        // http://nakigao.sitemix.jp/blog/?p=2040\r
                                        // SafariでHTTP/412のエラー\r
-                                       headers[ 'If-Modified-Since' ] = ( new Date ).toUTCString();\r
+                                       // headers[ 'If-Modified-Since' ] = ( new Date ).toUTCString();\r
                                        \r
                                        for( p in headers ){\r
                                                if( X_EMPTY_OBJECT[ p ] ) continue;\r
@@ -263,10 +290,10 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
                                                                case 1 :\r
                                                                        return;\r
                                                                case 2 : // 0% ajaxstart\r
-                                                                       live && this[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, percent : 0 } );\r
+                                                                       live && this[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : 0 } );\r
                                                                        return;\r
                                                                case 3 :\r
-                                                                       live && this[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, percent : this._percent < 99.9 ? 99.9 : ( this._percent + 100 ) / 2 } );\r
+                                                                       live && this[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : this._percent < 99.9 ? 99.9 : ( this._percent + 100 ) / 2 } );\r
                                                                        // 99.9%\r
                                                                        return;\r
                                                                case 4 :\r
@@ -333,14 +360,14 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
 \r
                                                        this[ 'asyncDispatch' ]( 32, { type : X_EVENT_SUCCESS, status : status || 200, data : data } );\r
                                                } else {\r
-                                                       live && this[ 'asyncDispatch' ]( 32, { type : X_EVENT_ERROR, status : raw.status || 0, percent : 100 } );\r
+                                                       live && this[ 'asyncDispatch' ]( 32, { type : X_EVENT_ERROR, status : raw.status || 0, 'percent' : 100 } );\r
                                                };\r
                                                break;\r
                                        \r
                                        case 'progress' :\r
                                                if( e.lengthComputable ){\r
                                                        this._percent = e.loaded / e.total;\r
-                                                       live && this[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, percent : this._percent } );\r
+                                                       live && this[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : this._percent } );\r
                                                };\r
                                                break;\r
                                        \r