Version 0.6.139, fix Node.animate when no.

[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 4eb6988..4f3ca4a 100644 (file)
--- a/0.6.x/js/06_net/01_XNetXHR.js
+++ b/0.6.x/js/06_net/01_XNetXHR.js
@@ -33,6 +33,8 @@ Android1.6- の XHR で 401 エラーが返った場合は、iframe に xml を
 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 = false && X_Net_XHR_W3C && X_Net_XHR_W3C.onprogress !== undefined,\r
+       X_Net_XHR_upload   = false && 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
@@ -64,11 +66,13 @@ X[ 'Net' ][ 'XHR' ] = {
  */\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
@@ -191,8 +195,11 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
                                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
@@ -247,9 +254,18 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
                                // 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
@@ -398,7 +414,7 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
                                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
@@ -421,13 +437,13 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
        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