OSDN Git Service

Version 0.6.112, fix X.Node.Anime, rewite X.Audio.* for AudioSprite, add X.Audio...
[pettanr/clientJs.git] / 0.6.x / js / 06_net / 01_XNetXHR.js
index 11e5ba7..fa2e49c 100644 (file)
@@ -86,6 +86,7 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
                        _busy      : false,\r
                        _canceled  : false,\r
                        _percent   : 0,\r
+                       _timerID   : 0,\r
                        \r
                        load : function( obj ){\r
                                var raw      = this._rawObject,\r
@@ -96,7 +97,7 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
                                        password = obj[ 'password' ],\r
                                        headers  = obj[ 'headers' ],\r
                                        postbody = obj[ 'postbody' ],\r
-                                       timeout  = obj[ 'timeout' ],\r
+                                       timeout  = obj[ 'timeout' ] || 20000,\r
                                        temp;\r
                                \r
                                if( obj[ 'type' ] ){\r
@@ -127,8 +128,30 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
                                                };\r
                                        };\r
                                };\r
-                               //if( raw.timeout !== undefined ) raw.timeout = timeout || -1;\r
-                               raw.open( method, url, false );\r
+                               \r
+                               raw.open( method, url, true );\r
+                               \r
+                               if( raw.responseType !== undefined ){\r
+                                       switch( this._type ){\r
+                                               case '' :\r
+                                               case 'text' :\r
+                                                       raw.responseType = 'text';\r
+                                                       break;\r
+                                               case 'json' :\r
+                                               case 'moz-json' :\r
+                                                       break;\r
+                                               case 'document' :\r
+                                               case 'xml' :\r
+                                               case 'html' :\r
+                                               case 'htm' :\r
+                                                       raw.responseType = 'document';\r
+                                                       break;\r
+                                               case 'blob' :\r
+                                               case 'arraybuffer' :\r
+                                                       raw.responseType = this._type;\r
+                                                       break;\r
+                                       };\r
+                               };\r
                                \r
                                // http://www.quirksmode.org/blog/archives/2005/09/xmlhttp_notes_r_1.html\r
                                // raw.overrideMimeType()\r
@@ -138,6 +161,12 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
                                        };              \r
                                };\r
                                \r
+                               if( raw.timeout !== undefined ){\r
+                                       raw.timeout = timeout; //Firefox33 でエラー,,,\r
+                               } else {\r
+                                       this._timerID = X.Timer.once( timeout, this, this.onTimeout );\r
+                               };      \r
+                               \r
                                // send 前にフラグを立てる,回線が早いと raw.send() 内で onload -> _busy = false ののち、 _busy = true するため。\r
                                this._busy = true;\r
                                \r
@@ -148,14 +177,33 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
                        },\r
                        \r
                        cancel : function(){\r
-                               X.Net.XHR.CANCELABLE && this._rawObject.abort();\r
+                               /* X.Net.XHR.CANCELABLE && */ this._rawObject.abort && this._rawObject.abort();\r
                                this._canceled = true;\r
+                               this.asyncDispatch( X.Event.CANCELED );\r
                        },\r
                        \r
                        reset : function(){\r
+                               // XMLHttpRequest で順番にリソースを取得する\r
+                               // http://note.chiebukuro.yahoo.co.jp/detail/n16248\r
+                               // TODO Opera 10.10 と Safari 4.1 はエラーが起きた XHR を再利用できないので毎回作る\r
+                               \r
+                               // \r
+                               // domes.lingua.heliohost.org/dom-intro/load-save2.html\r
+                               // 規定上は open() を呼び出すと XMLHttpRequest オブジェクトが未送信状態に戻りますが、\r
+                               // Opera 10.10、Safari 4.1 では、同一オリジン制限に違反した XMLHttpRequest オブジェクトは再度 open() しても未送信状態に戻りません。\r
+                               if( X_UA.Opera || X_UA.Webkit ){\r
+                                       \r
+                               };\r
+\r
+                               // XMLHttpRequest の使い方\r
+                               // http://webos-goodies.jp/archives/50548720.html\r
+                               // XMLHttpRequest オブジェクトを再利用する際も、 abort メソッドを呼び出す必要があるようです。\r
+                               this._rawObject.abort && this._rawObject.abort();\r
+\r
                                this._method   = this._type = '';\r
                                this._canceled = this._busy = false;\r
-                               this._percent  = 0;\r
+                               this._timerID && X.Timer.remove( this._timerID );\r
+                               this._percent  = this._timerID = 0;\r
                        },\r
                        \r
                        handleEvent : function( e ){\r
@@ -253,7 +301,6 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
                                                break;\r
                                        \r
                                        case 'progress' :\r
-                                               // TODO X.Dom.Event でコピーしていないのでまだ動かない、、、\r
                                                if( e.lengthComputable ){\r
                                                        this._percent = e.loaded / e.total;\r
                                                        live && this.asyncDispatch( { type : X.Event.PROGRESS, percent : this._percent } );\r
@@ -265,18 +312,25 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
                                                this._busy = false;\r
                                                live && this.asyncDispatch( { type : X.Event.ERROR, status : raw.status } );\r
                                                break;\r
-                                       \r
-                                       //case 'abort' :\r
-                                       //      this._busy = false;\r
-                                       //      this.asyncDispatch( { type : X.Event.ERROR, status : raw.status } );\r
-                                       //      break;\r
+\r
                                        case 'timeout' : // Gecko 12.0 https://developer.mozilla.org/ja/docs/XMLHttpRequest/Synchronous_and_Asynchronous_Requests\r
                                                this._busy = false;\r
-                                               live && this.asyncDispatch( { type : X.Event.ERROR, status : raw.status } );\r
+                                               this.asyncDispatch( X.Event.TIMEOUT );\r
                                                break;\r
                                };\r
                        },\r
                        \r
+                       onTimeout : function(){\r
+                               var raw  = this._rawObject,\r
+                                       live = !X_NET_XHRWrapper._canceled || !this._busy;\r
+\r
+                               if( raw.readyState < 3 ){\r
+                                       this._busy = false;\r
+                                       live && this.asyncDispatch( X.Event.TIMEOUT );\r
+                               };\r
+                               this._timerID = 0;\r
+                       },\r
+                       \r
                        onUploadProgress : X.Net.XHR.UL_PROGRESS && function( e ){\r
                                var raw  = X_NET_XHRWrapper._rawObject.upload,\r
                                        live = !X_NET_XHRWrapper._canceled,\r
@@ -287,25 +341,23 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
        );\r
        // 同期リクエストでなければならない場合, unload, beforeunload時\r
 \r
-\r
-       // ie8 では timeout が有効, MSXML のバージョンは関係なさそう、、、\r
        if( X_UA.IE8 ){\r
-               X_NET_XHRWrapper.listen( [ 'readystatechange', 'error', 'abort', 'timeout' ] );\r
+               X_NET_XHRWrapper.listen( [ 'readystatechange', 'error', 'timeout' ] ); //, 'abort'\r
        } else\r
        if( X_UA.IE7 ){\r
                if( X_URL_IS_LOCAL ){\r
                        X_NET_XHRWrapper.listen( 'readystatechange' ); // ie7 ActiveX の場合、error は不可\r
                } else {\r
-                       X_NET_XHRWrapper.listen( [ 'readystatechange', 'error' ] ); // ie7 ActiveX の場合、error は不可\r
+                       X_NET_XHRWrapper.listen( [ 'readystatechange', 'error' ] );\r
                };\r
        } else\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
-               X_NET_XHRWrapper.listen( [ 'load', 'progress', 'error', 'abort', 'timeout' ] );\r
+               X_NET_XHRWrapper.listen( [ 'load', 'progress', 'error', 'timeout' ] ); //, 'abort'\r
        } else {\r
-               X_NET_XHRWrapper.listen( [ 'load', 'readystatechange', 'error', 'abort', 'timeout' ] );\r
+               X_NET_XHRWrapper.listen( [ 'load', 'readystatechange', 'error', 'timeout' ] ); //, 'abort'\r
        };\r
        \r
        if( X.Net.XHR.UL_PROGRESS ){\r