OSDN Git Service
(root)
/
pettanr
/
clientJs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 0.6.166, fix X.XHR.GadgetProxy.
[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
dad1597
..
f6b8357
100644
(file)
--- a/
0.6.x/js/06_net/01_XNetXHR.js
+++ b/
0.6.x/js/06_net/01_XNetXHR.js
@@
-155,7
+155,7
@@
X_TEMP.X_Net_XHR_params = {
xDomain = !X_URL_isSameDomain( url ),
\r
isFile = X_URL_isLocal( url ),
\r
init,
\r
xDomain = !X_URL_isSameDomain( url ),
\r
isFile = X_URL_isLocal( url ),
\r
init,
\r
- tmp;
\r
+ tmp
, p
;
\r
\r
this._dataType = obj[ 'dataType' ];
\r
\r
\r
this._dataType = obj[ 'dataType' ];
\r
\r
@@
-431,12
+431,11
@@
X_TEMP.X_Net_XHR_params = {
( 200 <= status && status < 400 ) ||
\r
//status === 304 ||
\r
( status === 1223 && ( status = 204 ) ) ||
\r
( 200 <= status && status < 400 ) ||
\r
//status === 304 ||
\r
( status === 1223 && ( status = 204 ) ) ||
\r
- ( X_UA[ 'Webkit' ] && status === undefined
&& ( status = 200 )
) // safari: /webkit/.test(userAgent)
\r
+ ( X_UA[ 'Webkit' ] && status === undefined ) // safari: /webkit/.test(userAgent)
\r
){
\r
/*
\r
* opera8, safari2, khtml3 で utf8 日本語文字列の文字化け
\r
*/
\r
){
\r
/*
\r
* opera8, safari2, khtml3 で utf8 日本語文字列の文字化け
\r
*/
\r
- // raw.getAllResponseHeaders();
\r
\r
// parse json, html, xml, text, script, css
\r
switch( X_NET_XHRWrapper._dataType ){
\r
\r
// parse json, html, xml, text, script, css
\r
switch( X_NET_XHRWrapper._dataType ){
\r
@@
-465,9
+464,9
@@
X_TEMP.X_Net_XHR_params = {
break;
\r
};
\r
\r
break;
\r
};
\r
\r
- X_NET_XHRWrapper[ 'asyncDispatch' ]( 32, { type : X_EVENT_SUCCESS, status : status || 200,
data : data, headers
: headers || null } );
\r
+ X_NET_XHRWrapper[ 'asyncDispatch' ]( 32, { type : X_EVENT_SUCCESS, status : status || 200,
response : data, 'headers'
: headers || null } );
\r
} else {
\r
} else {
\r
- X_NET_XHRWrapper[ 'asyncDispatch' ]( 32, { type : X_EVENT_ERROR, status :
raw.status || 0, 'percent' : 100, headers
: headers || null } );
\r
+ X_NET_XHRWrapper[ 'asyncDispatch' ]( 32, { type : X_EVENT_ERROR, status :
status || 400, 'headers'
: headers || null } );
\r
};
\r
break;
\r
\r
};
\r
break;
\r
\r
@@
-488,7
+487,7
@@
X_TEMP.X_Net_XHR_params = {
case 'timeout' : // Gecko 12.0 https://developer.mozilla.org/ja/docs/XMLHttpRequest/Synchronous_and_Asynchronous_Requests
\r
X_NET_XHRWrapper._busy = false;
\r
X_NET_XHRWrapper._error = !!X_UA[ 'Gecko' ];
\r
case 'timeout' : // Gecko 12.0 https://developer.mozilla.org/ja/docs/XMLHttpRequest/Synchronous_and_Asynchronous_Requests
\r
X_NET_XHRWrapper._busy = false;
\r
X_NET_XHRWrapper._error = !!X_UA[ 'Gecko' ];
\r
- X_NET_XHRWrapper[ 'asyncDispatch' ](
X_EVENT_TIMEOUT
);
\r
+ X_NET_XHRWrapper[ 'asyncDispatch' ](
{ type :X_EVENT_ERROR, 'timeout' : true }
);
\r
break;
\r
};
\r
},
\r
break;
\r
};
\r
},
\r
@@
-499,7
+498,7
@@
X_TEMP.X_Net_XHR_params = {
\r
if( live || raw.readyState < 3 ){
\r
this._busy = false;
\r
\r
if( live || raw.readyState < 3 ){
\r
this._busy = false;
\r
- live && this[ 'asyncDispatch' ](
X_EVENT_TIMEOUT
);
\r
+ live && this[ 'asyncDispatch' ](
{ type : X_EVENT_ERROR, 'timeout' : true }
);
\r
};
\r
this._timerID = 0;
\r
},
\r
};
\r
this._timerID = 0;
\r
},
\r
@@
-527,7
+526,7
@@
X_TEMP.X_Net_XHR_params = {
*/
\r
\r
function X_NET_XHR_parseResponseHeaders( headerStr ){
\r
*/
\r
\r
function X_NET_XHR_parseResponseHeaders( headerStr ){
\r
- var headers = {}, headerPairs, i = 0, l, headerPair, index, key, val
ue
;
\r
+ var headers = {}, headerPairs, i = 0, l, headerPair, index, key, val;
\r
\r
if( !headerStr ) return headers;
\r
\r
\r
if( !headerStr ) return headers;
\r
\r