X-Git-Url: http://git.osdn.jp/view?p=pettanr%2FclientJs.git;a=blobdiff_plain;f=0.6.x%2Fjs%2F06_net%2F03_XNetForm.js;fp=0.6.x%2Fjs%2F06_net%2F03_XNetForm.js;h=cdbcb4ffe021b2ee5c245f4c12d8e66d374f1e31;hp=66a1bacfef7f02cb097d96c7e867aabb0688aee0;hb=009b1cd0cebdd15591a9abfb964fb57b41ccb5f9;hpb=3d10dbbb167c89638f3bea6c267de8763274d30c diff --git a/0.6.x/js/06_net/03_XNetForm.js b/0.6.x/js/06_net/03_XNetForm.js index 66a1bac..cdbcb4f 100644 --- a/0.6.x/js/06_net/03_XNetForm.js +++ b/0.6.x/js/06_net/03_XNetForm.js @@ -1,7 +1,7 @@ //{+netform"
によるGETとPOST"(動的に生成したフォームによるGETとPOST。)[+net,+ninjaiframe] var X_FormSender_errorTimerID, - X_FormSender_isLeave, + X_FormSender_isLeave, X_FormSender_isSameDomain, X_FormSender_onloadCount = 0; X_TEMP.X_FormSender_init = function(){ @@ -30,6 +30,7 @@ X_TEMP.X_FormSender_params = { load : function( option ){ //createURL var params = option[ 'params' ] || {}, + url = option[ 'url' ], target = option[ 'target' ], timeout = option[ 'timeout' ], // http://search.web-sun.com/zatu/charset.html @@ -40,12 +41,12 @@ X_TEMP.X_FormSender_params = { html = [ // '' ]; - X_FormSender_isLeave = target === '_top' || target === '_parent'; - + X_FormSender_isLeave = target === '_top' || target === '_parent'; + X_FormSender_isSameDomain = X_URL_isSameDomain( url ); for( k in params ){ // TODO 使用すべきでない name @@ -91,9 +92,12 @@ function X_FormSender_iframeListener( e ){ }; if( ++X_FormSender_onloadCount === 1 ){ - idoc = this[ '_rawObject' ].contentDocument || this._iwin.document, - - X_FormSender[ 'asyncDispatch' ]( { type : X_EVENT_SUCCESS, response : idoc && idoc.body ? idoc.body.innerHTML : '' } ); + if( X_FormSender_isSameDomain ){ + idoc = this[ '_rawObject' ].contentDocument || this._iwin.document; + X_FormSender[ 'asyncDispatch' ]( { type : X_EVENT_SUCCESS, response : idoc && idoc.body ? idoc.body.innerHTML : '' } ); + } else { + X_FormSender[ 'asyncDispatch' ]( { type : X_EVENT_SUCCESS } ); + }; }; break; case 'ninjaerror' :