OSDN Git Service

Version 0.6.138, working X.UI.ScrollBox!, fix Node.prev & Node.next.
[pettanr/clientJs.git] / 0.6.x / js / 06_net / 01_XNetXHR.js
index fa2e49c..4eb6988 100644 (file)
@@ -18,11 +18,25 @@ new ActiveXObject( 'Msxml2.XMLHTTP' );     // バージョンを省略すると
 new ActiveXObject( 'Msxml2.XMLHTTP.4.0' ); // バージョン4.0 は bugfix が行われないので、3.0 か 6.0 を指定すべき\r
 new ActiveXObject( 'Msxml2.XMLHTTP.5.0' ); // バージョン5.0 は bugfix が行われないので、3.0 か 6.0 を指定すべき\r
 \r
+[IE][Javascript][Json] IE+JsonではまったAdd Star\r
+http://d.hatena.ne.jp/khiker/20081026/javascript_json\r
+> AddCharset utf-8 json\r
+> AddType text/javascript json\r
+\r
+JavaScriptでJSONをeval\r
+http://d.hatena.ne.jp/sshi/20060904/p1\r
+\r
+itozyun 2014-10-30 20:55:41\r
+basic 認証のかかったhtml を表示して、そのjsが xhr をすると Android1.6 では 401 error が返る。Android 2.3 では解決している。\r
+Android1.6- の XHR で 401 エラーが返った場合は、iframe に xml を表示させてその内容を取ればサーバ側の対応無しでいけるかも?\r
  */\r
-var X_Net_XHR_W3C      = ( !X_UA.IE7 || !X_URL_IS_LOCAL ) && window[ 'XMLHttpRequest' ] && new XMLHttpRequest(),\r
+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
+       \r
        X_Net_XHR_X_DOMAIN = window[ 'XDomainRequest' ] && new XDomainRequest(),\r
        X_Net_XHR_VERSION  = 0,\r
-       X_Net_XHR_ACTIVE_X = !X_UA.IE4 && X_UA.IE < 8 && X_UA.ActiveX && ( new Function( [\r
+       X_Net_XHR_ACTIVE_X = !X_UA[ 'IE4' ] && X_UA[ 'IE' ] < 8 && X_UA[ 'ActiveX' ] && ( new Function( [\r
                'var x=".XMLHTTP",',\r
                        'm="MSXML2"+x,',\r
                        'n=[m+".6.0",m+".3.0",m+".5.0",m+".4.0",m,"Microsoft"+x],',\r
@@ -31,7 +45,7 @@ var X_Net_XHR_W3C      = ( !X_UA.IE7 || !X_URL_IS_LOCAL ) && window[ 'XMLHttpReq
                'for(;i<5;){',\r
                        'try{',\r
                                'return[v[++i],new ActiveXObject(n[i])]',\r
-                       '}catch(e){return false}',\r
+                       '}catch(e){}',\r
                '}'\r
        ].join( '' ) ) )();\r
 \r
@@ -40,13 +54,7 @@ if( X_Net_XHR_ACTIVE_X ){
        X_Net_XHR_ACTIVE_X = X_Net_XHR_ACTIVE_X[ 1 ];\r
 };\r
 \r
-X.Net.XHR = {\r
-       // Opera7.6+, Safari1.2+, khtml3.?+, Gecko0.9.7+\r
-       W3C         : !!X_Net_XHR_W3C,\r
-\r
-       X_DOMAIN    : !!X_Net_XHR_X_DOMAIN,\r
-\r
-       ACTIVE_X    : !!X_Net_XHR_ACTIVE_X,\r
+X[ 'Net' ][ 'XHR' ] = {\r
 \r
 /*\r
  * http://hakuhin.jp/as/import.html\r
@@ -54,132 +62,176 @@ X.Net.XHR = {
  * http://hakuhin.jp/as/javascript.html\r
  * Flash から JavaScript にアクセスする(3+)\r
  */\r
-       FLASH       : false,\r
-       \r
-\r
-// ie7 ではローカルリソースには ActiveX の 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
-       UL_PROGRESS : false,\r
+       'PROGRESS'    : false, //\r
 \r
-       CANCELABLE  : false,\r
-       \r
-       TIMEOUT     : false\r
+       'UL_PROGRESS' : false,\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
        \r
        X_NET_XHRWrapper = X_Class_override(\r
-               new X.EventDispatcher(),\r
+               X_EventDispatcher(),\r
                {\r
-                                               \r
-                       _rawObject : X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X,\r
-                       _isXHR     : true,  // X.EventDispatcher で使用 for ie8-\r
+                       \r
+                       '_rawType'   : X_EventDispatcher_EVENT_TARGET_TYPE.XHR,\r
+                       '_rawObject' : X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X,\r
+                       \r
                        _isXDR     : false, // for ie8\r
                        \r
                        _method    : '',\r
                        _type      : '',\r
                        _busy      : false,\r
                        _canceled  : false,\r
+                       _error     : false,\r
                        _percent   : 0,\r
                        _timerID   : 0,\r
                        \r
                        load : function( obj ){\r
-                               var raw      = this._rawObject,\r
+                               var raw      = this[ '_rawObject' ],\r
                                        method   = obj[ 'method' ],\r
                                        url      = obj[ 'url' ],\r
                                        async    = obj[ 'async' ],\r
-                                       user     = obj[ 'user' ],\r
+                                       username = obj[ 'username' ],\r
                                        password = obj[ 'password' ],\r
-                                       headers  = obj[ 'headers' ],\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 = url.split( '#' )[ 0 ].split( '?' )[ 0 ].split( '.' );\r
-                                       if( 2 <= temp.length ){\r
-                                               this._type = temp[ temp.length - 1 ].toLowerCase();\r
-                                       };\r
-                               };\r
-                               \r
-                               // TODO ie7 http://127.0.0.1 に対しては ActiveX を使う, onerror は不可\r
+                               this._type = obj[ 'type' ] || X_URL_getEXT( url );\r
                                \r
                                if( X_Net_XHR_X_DOMAIN ){\r
-                                       if( false /* isXDomain( url ) */ ){ // isXDomain\r
-                                               if( !this._isXDR ){\r
+                                       if( X_URL_isSameDomain( url ) ){ // isXDomain\r
+                                               if( this._isXDR ){\r
                                                        X_EventDispatcher_toggleAllEvents( this, false );\r
-                                                       this._rawObject = X_Net_XHR_X_DOMAIN;\r
+                                                       this[ '_rawObject' ] = X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X;\r
                                                        X_EventDispatcher_toggleAllEvents( this, true );\r
-                                                       this._isXDR = true;\r
+                                                       this._isXDR = false;                                                    \r
                                                };\r
                                        } else {\r
-                                               if( this._isXDR ){\r
+                                               if( !this._isXDR ){\r
                                                        X_EventDispatcher_toggleAllEvents( this, false );\r
-                                                       this._rawObject = X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X;\r
+                                                       this[ '_rawObject' ] = X_Net_XHR_X_DOMAIN;\r
                                                        X_EventDispatcher_toggleAllEvents( this, true );\r
-                                                       this._isXDR = false;\r
+                                                       this._isXDR = true;                                                     \r
                                                };\r
                                        };\r
                                };\r
                                \r
-                               raw.open( method, url, true );\r
+                               raw.open( method, url, true, username, password );\r
                                \r
                                if( raw.responseType !== undefined ){\r
                                        switch( this._type ){\r
                                                case '' :\r
                                                case 'text' :\r
+                                               // js, css\r
                                                        raw.responseType = 'text';\r
                                                        break;\r
                                                case 'json' :\r
                                                case 'moz-json' :\r
+                                                       raw.responseType = X_UA[ 'Gecko' ] ? this._type : ''; // Iron 37 でエラー\r
                                                        break;\r
                                                case 'document' :\r
                                                case 'xml' :\r
                                                case 'html' :\r
                                                case 'htm' :\r
+                                               // svg\r
                                                        raw.responseType = 'document';\r
                                                        break;\r
                                                case 'blob' :\r
                                                case 'arraybuffer' :\r
+                                               // jpeg,jpg,png,gif,mp3,ogg...\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
-                               if( !X_Net_XHR_ACTIVE_X && X.Type.isFunction( raw.setRequestHeader ) ){\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
+                                       \r
                                        for( p in headers ){\r
+                                               if( X_EMPTY_OBJECT[ p ] ) continue;\r
                                                raw.setRequestHeader( p, headers[ p ] ); // Opera8.01+, MSXML3+\r
                                        };              \r
                                };\r
                                \r
                                if( raw.timeout !== undefined ){\r
-                                       raw.timeout = timeout; //Firefox33 でエラー,,,\r
+                                       raw.timeout = timeout;\r
                                } else {\r
-                                       this._timerID = X.Timer.once( timeout, this, this.onTimeout );\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
+\r
+                               raw.send( postbody || '' );\r
+                               //this._timerID = X_Timer_once( 16, this, this._lazySend, [ postbody || '', timeout ] );\r
+                       },\r
+                       /*\r
+                       // send() 内で onload するケースがあり、そのときはイベントリスナが間に合わないので、タイマーをかませる。\r
+                       _lazySend : function( postbody, timeout ){\r
+                               if( this[ '_rawObject' ].timeout === undefined ){\r
+                                       this._timerID = X_Timer_once( timeout, this, this.onTimeout );\r
+                               } else {\r
+                                       this._timerID = 0;\r
+                               };\r
+                               \r
                                // http://allabout.co.jp/gm/gc/24097/#1\r
                                // sendをonreadystatechangeの前に記述すると、ieでは動作しなくなります、、、。\r
                                // konquerorでエラーが発生するのでここでは、とりあえず、send('') としました。\r
-                               raw.send( postbody || '' );\r
-                       },\r
+                               this[ '_rawObject' ].send( postbody );                          \r
+                       }, */\r
                        \r
                        cancel : function(){\r
-                               /* X.Net.XHR.CANCELABLE && */ this._rawObject.abort && 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
+                               this[ 'asyncDispatch' ]( X_EVENT_CANCELED );\r
                        },\r
                        \r
                        reset : function(){\r
@@ -191,23 +243,29 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
                                // 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
+                               // Timeout した Gecko の xhr.response に触るとエラー??\r
+                               if( X_UA[ 'Opera' ] || X_UA[ 'Webkit' ]  || X_UA[ 'Gecko' ] ){\r
+                                       if( this._error ){\r
+                                               X_EventDispatcher_toggleAllEvents( this, false );\r
+                                               this[ '_rawObject' ] = new XMLHttpRequest();\r
+                                               X_EventDispatcher_toggleAllEvents( this, true );\r
+                                       };\r
                                };\r
 \r
                                // XMLHttpRequest の使い方\r
                                // http://webos-goodies.jp/archives/50548720.html\r
                                // XMLHttpRequest オブジェクトを再利用する際も、 abort メソッドを呼び出す必要があるようです。\r
-                               this._rawObject.abort && this._rawObject.abort();\r
+                               this[ '_rawObject' ].abort && this[ '_rawObject' ].abort();\r
 \r
                                this._method   = this._type = '';\r
-                               this._canceled = this._busy = false;\r
-                               this._timerID && X.Timer.remove( this._timerID );\r
+                               this._canceled = this._busy = this._error = false;\r
+                               this._timerID && X_Timer_remove( this._timerID );\r
                                this._percent  = this._timerID = 0;\r
                        },\r
                        \r
                        handleEvent : function( e ){\r
-                               var raw  = this._rawObject,\r
+                               var raw  = this[ '_rawObject' ],\r
                                        live = !this._canceled,\r
                                        status, data;\r
 \r
@@ -233,10 +291,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
@@ -252,7 +310,7 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
                                        case 'load' :\r
                                                \r
                                                if( !live ) return this.reset();\r
-                                               if( this._percent === 100 ) return;\r
+                                               if( !this._busy ) return;\r
                                                \r
                                                \r
                                                this._percent = 100;\r
@@ -262,10 +320,12 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
                                                // https://code.google.com/p/fakeworker-js/source/browse/src/javascript/fakeworker.js\r
                                                if(\r
                                                        ( !status && location.protocol === 'file:' ) ||\r
-                                           ( 200 <= status && status < 300 ) ||\r
-                                           status === 304 ||\r
+                                                       // IE 6.0 でローカルファイルにアクセスした\r
+                                                       ( status < 100 ) ||\r
+                                           ( 200 <= status && status < 400 ) ||\r
+                                           //status === 304 ||\r
                                            status === 1223 ||\r
-                                           ( X_UA.Webkit && status === undefined ) // safari: /webkit/.test(userAgent)\r
+                                           ( X_UA[ 'Webkit' ]  && status === undefined ) // safari: /webkit/.test(userAgent)\r
                                                ){\r
                                                        /*\r
                                                         * opera8, safari2, khtml3 で utf8 日本語文字列の文字化け\r
@@ -280,13 +340,18 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
                                                                        break;\r
                                                                case 'json' :\r
                                                                case 'moz-json' :\r
-                                                                       data = raw[ 'response' ] || raw[ 'responseText' ]; // とりあえず\r
+                                                                       data = raw[ 'response' ] || raw[ 'responseText' ];\r
+                                                                       // eval() を使っているけど JSON の無いブラウザは XDomain な XHR はできないのでよしとする。\r
+                                                                       // XDomain な XHR の際は Flash 等で代替し、その中に Json parser も組み込む。\r
+                                                                       // http://d.hatena.ne.jp/sshi/20060904/p1\r
+                                                                       if( !X_Type_isObject( data ) ) data = window.JSON ? JSON.parse( data ) : eval( '(' + data + ')' );\r
                                                                        break;\r
                                                                case 'document' :\r
                                                                case 'xml' :\r
                                                                case 'html' :\r
                                                                case 'htm' :\r
-                                                                       data = raw[ 'responseXML' ];\r
+                                                               // svg, vml, xaml, xul, mxml ??\r
+                                                                       data = raw[ 'responseXML' ] || raw[ 'response' ] || raw[ 'responseText' ]; // とりあえず\r
                                                                        break;\r
                                                                case 'blob' :\r
                                                                case 'arraybuffer' :\r
@@ -294,45 +359,47 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
                                                                        break;\r
                                                        };\r
 \r
-                                                       this.asyncDispatch( { type : X.Event.SUCCESS, status : status || 200, data : data } );                                                  \r
+                                                       this[ 'asyncDispatch' ]( 32, { type : X_EVENT_SUCCESS, status : status || 200, data : data } );\r
                                                } else {\r
-                                                       live && this.asyncDispatch( { 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
                                        case 'error' :\r
                                        //console.dir( e );\r
-                                               this._busy = false;\r
-                                               live && this.asyncDispatch( { type : X.Event.ERROR, status : raw.status } );\r
+                                               this._busy  = false;\r
+                                               this._error = X_UA[ 'Opera' ] || X_UA[ 'Webkit' ] ;\r
+                                               live && this[ 'asyncDispatch' ]( 32, { 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
-                                               this.asyncDispatch( X.Event.TIMEOUT );\r
+                                               this._busy  = false;\r
+                                               this._error = !!X_UA[ 'Gecko' ];\r
+                                               this[ 'asyncDispatch' ]( X_EVENT_TIMEOUT );\r
                                                break;\r
                                };\r
                        },\r
                        \r
                        onTimeout : function(){\r
-                               var raw  = this._rawObject,\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
+                                       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
+                       onUploadProgress : X[ 'Net' ][ 'XHR' ][ 'UL_PROGRESS' ] && function( e ){\r
+                               var raw  = X_NET_XHRWrapper[ '_rawObject' ].upload,\r
                                        live = !X_NET_XHRWrapper._canceled,\r
                                        states, data;\r
                        }\r
@@ -341,27 +408,27 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
        );\r
        // 同期リクエストでなければならない場合, unload, beforeunload時\r
 \r
-       if( X_UA.IE8 ){\r
-               X_NET_XHRWrapper.listen( [ 'readystatechange', 'error', 'timeout' ] ); //, 'abort'\r
+       if( X_UA[ 'IE8' ] ){\r
+               X_NET_XHRWrapper[ 'listen' ]( [ 'readystatechange', 'error', 'timeout' ] ); //, 'abort'\r
        } else\r
-       if( X_UA.IE7 ){\r
+       if( X_UA[ 'IE7' ] ){\r
                if( X_URL_IS_LOCAL ){\r
-                       X_NET_XHRWrapper.listen( 'readystatechange' ); // ie7 ActiveX の場合、error は不可\r
+                       X_NET_XHRWrapper[ 'listen' ]( 'readystatechange' ); // ie7 ActiveX の場合、error は不可\r
                } else {\r
-                       X_NET_XHRWrapper.listen( [ 'readystatechange', '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
+               X_NET_XHRWrapper[ 'listen' ]( 'readystatechange' );\r
        } else \r
-       if( X.Net.XHR.PROGRESS ){\r
-               X_NET_XHRWrapper.listen( [ 'load', 'progress', 'error', 'timeout' ] ); //, 'abort'\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
+               X_NET_XHRWrapper[ 'listen' ]( [ 'load', 'readystatechange', 'error', 'timeout' ] ); //, 'abort'\r
        };\r
        \r
-       if( X.Net.XHR.UL_PROGRESS ){\r
-               X_NET_XHRWrapper._rawObject.upload.addEventListener( 'progress', X.Net.XHR.xhr.onUploadProgress );\r
+       if( X_NET_XHRWrapper.onUploadProgress ){\r
+               X_NET_XHRWrapper[ '_rawObject' ].upload.addEventListener( 'progress', X_NET_XHRWrapper.onUploadProgress );\r
        };\r
 };\r
 \r