Version 0.6.146, fix XHR.send, add RegExp free encodeURIComponent, fix X.Object.deepCopy.

[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 000ba11..cd4d0e6 100644 (file)
--- a/0.6.x/js/06_net/01_XNetXHR.js
+++ b/0.6.x/js/06_net/01_XNetXHR.js
@@ -103,6 +103,8 @@ X_TEMP.X_Net_XHR_init = function(){
                        _percent   : 0,\r
                        _timerID   : 0,\r
                        \r
+                       _auth      : null,\r
+                       \r
                        load : function( obj ){\r
                                var raw      = this[ '_rawObject' ],\r
                                        method   = obj[ 'method' ],\r
@@ -111,26 +113,26 @@ X_TEMP.X_Net_XHR_init = function(){
                                        username = obj[ 'username' ],\r
                                        password = obj[ 'password' ],\r
                                        headers  = obj[ 'headers' ] || {},\r
-                                       postdata = obj[ 'postdata' ],\r
+                                       postdata = obj[ 'postdata' ] || '',\r
                                        timeout  = obj[ 'timeout' ] || 20000,\r
                                        tmp;\r
-                               \r
+\r
                                this._dataType = obj[ 'dataType' ] || X_URL_getEXT( url );\r
                                \r
                                if( X_Net_XHR_X_DOMAIN ){\r
                                        if( X_URL_isSameDomain( url ) ){ // isXDomain\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' ] = raw = X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X;\r
                                                        X_EventDispatcher_toggleAllEvents( this, true );\r
-                                                       this._isXDR = false;                                                    \r
+                                                       this._isXDR = false;\r
                                                };\r
                                        } else {\r
                                                if( !this._isXDR ){\r
                                                        X_EventDispatcher_toggleAllEvents( this, false );\r
-                                                       this[ '_rawObject' ] = X_Net_XHR_X_DOMAIN;\r
+                                                       this[ '_rawObject' ] = raw = X_Net_XHR_X_DOMAIN;\r
                                                        X_EventDispatcher_toggleAllEvents( this, true );\r
-                                                       this._isXDR = true;                                                     \r
+                                                       this._isXDR = true;                                     \r
                                                };\r
                                        };\r
                                };\r
@@ -199,7 +201,7 @@ X_TEMP.X_Net_XHR_init = function(){
                                        console.log( obj[ 'mimeType' ] || tmp );\r
                                };\r
 \r
-                               if( !X_Net_XHR_ACTIVE_X && X_Type_isFunction( raw.setRequestHeader ) ){\r
+                               if( /* !X_Net_XHR_ACTIVE_X && !this._isXDR && */ X_Type_isFunction( raw.setRequestHeader ) ){\r
                                        \r
                                        // http://nakigao.sitemix.jp/blog/?p=2040\r
                                        // json 取得時に SafariでHTTP/412のエラー。但し相手が audio の場合、この指定があるとロードに失敗する。 iOS8.2, iOS7.1 では遭遇せず\r
@@ -222,9 +224,8 @@ X_TEMP.X_Net_XHR_init = function(){
                                \r
                                // send 前にフラグを立てる,回線が早いと raw.send() 内で onload -> _busy = false ののち、 _busy = true するため。\r
                                this._busy = true;\r
-                               \r
-                               // TODO toString\r
-                               raw.send( postdata || '' );\r
+\r
+                               raw.send( X_Type_isString( postdata ) ? postdata : X_String_serialize( postdata ) );\r
                        },\r
                        \r
                        cancel : function(){\r
@@ -367,8 +368,9 @@ X_TEMP.X_Net_XHR_init = function(){
                                                        };\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
+                                               } else\r
+                                               if( live ){\r
+                                                       this[ 'asyncDispatch' ]( 32, { type : X_EVENT_ERROR, status : raw.status || 0, 'percent' : 100 } );\r
                                                };\r
                                                break;\r
                                        \r