var // Opera7.6+, Safari1.2+, khtml3.?+, Gecko0.9.7+\r
// ie7 ではローカルリソースには ActiveX の XHR を使う\r
X_Net_XHR_W3C = ( !X_UA[ 'IE7' ] || !X_URL_IS_LOCAL ) && window[ 'XMLHttpRequest' ] && new XMLHttpRequest(),\r
+ X_Net_XHR_progress = X_Net_XHR_W3C && X_Net_XHR_W3C.onprogress !== undefined,\r
+ X_Net_XHR_upload = X_Net_XHR_W3C && !!X_Net_XHR_W3C.upload,\r
\r
X_Net_XHR_X_DOMAIN = window[ 'XDomainRequest' ] && new XDomainRequest(),\r
X_Net_XHR_VERSION = 0,\r
X_Net_XHR_ACTIVE_X = X_Net_XHR_ACTIVE_X[ 1 ];\r
};\r
\r
-X.Net.XHR = {\r
+X[ 'Net' ][ 'XHR' ] = {\r
\r
/*\r
* http://hakuhin.jp/as/import.html\r
* http://hakuhin.jp/as/javascript.html\r
* Flash から JavaScript にアクセスする(3+)\r
*/\r
- FLASH : false,\r
+ 'FLASH' : false,\r
\r
-// https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest\r
-// Progress Events Chrome7, firefox3.5, ie10, opera12, Safari?, Chrome for Android 0.16\r
- PROGRESS : false, //\r
+/**\r
+ * https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest\r
+ * Progress Events Chrome7, firefox3.5, ie10, opera12, Safari?, Chrome for Android 0.16\r
+ */\r
+ 'PROGRESS' : X_Net_XHR_progress, //\r
\r
- UL_PROGRESS : false\r
+ 'UL_PROGRESS' : X_Net_XHR_upload,\r
\r
+ 'CORS' : X_Net_XHR_X_DOMAIN || ( X_Net_XHR_W3C && X_Net_XHR_W3C.withCredentials !== undefined )\r
};\r
\r
if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){\r
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
};\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
+ // json 取得時に SafariでHTTP/412のエラー。但し相手が audio の場合、この指定があるとロードに失敗する。 iOS8.2, iOS7.1 では遭遇せず\r
+ if( this._type === 'json' ){\r
+ console.log( 'If-Modified-Since : ' + this._type );\r
+ headers[ 'If-Modified-Since' ] = ( new Date ).toUTCString();\r
+ };\r
\r
for( p in headers ){\r
if( X_EMPTY_OBJECT[ p ] ) continue;\r
// Timeout した Gecko の xhr.response に触るとエラー??\r
if( X_UA[ 'Opera' ] || X_UA[ 'Webkit' ] || X_UA[ 'Gecko' ] ){\r
if( this._error ){\r
+ \r
+ if( X_Net_XHR_upload ){\r
+ this[ '_rawObject' ].upload.removeEventListener( 'progress', X_NET_XHRWrapper.onUploadProgress );\r
+ };\r
+ \r
X_EventDispatcher_toggleAllEvents( this, false );\r
this[ '_rawObject' ] = new XMLHttpRequest();\r
X_EventDispatcher_toggleAllEvents( this, true );\r
+ \r
+ if( X_Net_XHR_upload ){\r
+ this[ '_rawObject' ].upload.addEventListener( 'progress', X_NET_XHRWrapper.onUploadProgress );\r
+ };\r
};\r
};\r
\r
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
\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
this._timerID = 0;\r
},\r
\r
- onUploadProgress : X.Net.XHR.UL_PROGRESS && function( e ){\r
+ onUploadProgress : X_Net_XHR_upload && function( e ){\r
var raw = X_NET_XHRWrapper[ '_rawObject' ].upload,\r
live = !X_NET_XHRWrapper._canceled,\r
states, data;\r
if( X_Net_XHR_ACTIVE_X ){ // win ie5-6\r
X_NET_XHRWrapper[ 'listen' ]( 'readystatechange' );\r
} else \r
- if( X.Net.XHR.PROGRESS ){\r
+ if( X_Net_XHR_progress ){\r
X_NET_XHRWrapper[ 'listen' ]( [ 'load', 'progress', 'error', 'timeout' ] ); //, 'abort'\r
} else {\r
X_NET_XHRWrapper[ 'listen' ]( [ 'load', 'readystatechange', 'error', 'timeout' ] ); //, 'abort'\r
};\r
\r
- if( X_NET_XHRWrapper.onUploadProgress ){\r
+ if( X_Net_XHR_upload ){\r
X_NET_XHRWrapper[ '_rawObject' ].upload.addEventListener( 'progress', X_NET_XHRWrapper.onUploadProgress );\r
};\r
};\r
OSDN Git Service
