X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F06_net%2F03_XNetForm.js;h=dd2ab0eb4f734a23fe79f9adb846eb29b0f6aace;hb=9e04e2a1221a92960a74e550bc3fd809caf3cd1c;hp=ce5021a78ffb8e8086db7b9d714afcde9fe7648c;hpb=3d352d8bf476ab57cc333e8d02d0e6ea5efa69b7;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/06_net/03_XNetForm.js b/0.6.x/js/06_net/03_XNetForm.js
index ce5021a..dd2ab0e 100644
--- a/0.6.x/js/06_net/03_XNetForm.js
+++ b/0.6.x/js/06_net/03_XNetForm.js
@@ -1,24 +1,26 @@
 //{+netform"<form>によるGETとPOST"(動的に生成したフォームによるGETとPOST。)[+net,+ninjaiframe]
 
-var X_NET_Form_errorTimerID, X_Net_Form_onloadCount = 0;
+var X_FormSender_errorTimerID, X_FormSender_onloadCount = 0;
 
-X_TEMP.X_NET_Form_init = function(){
-	X_NET_FormWrapper = X_Class_override( X_NinjaIframe(), X_TEMP.X_NET_Form_params );
+X_TEMP.X_FormSender_init = function(){
+	X_FormSender = X_Class_override( X_NinjaIframe(), X_TEMP.X_FormSender_params );
 	
-	delete X_TEMP.X_NET_Form_init;
-	delete X_TEMP.X_NET_Form_params;
+	delete X_TEMP.X_FormSender_init;
+	delete X_TEMP.X_FormSender_params;
 	
-	return X_NET_FormWrapper;
+	return X_FormSender;
 };
 
 /*
- * form 構築時に "><script> といった文字列の挿入を禁止するために " を エスケープする、併せて改行文字を消す
+ * form 構築時に "><script> といった文字列の挿入を禁止するために " を エスケープする
+ * TODO 改行文字を消す
  */
-function X_NET_Form_escapeQuote( str ){
+function X_FormSender_escapeQuote( str ){
+	
 	return X_String_toChrReferance( str );
 };
 
-X_TEMP.X_NET_Form_params = {
+X_TEMP.X_FormSender_params = {
 	
 			_busy     : false,
 			_canceled : false,
@@ -34,44 +36,43 @@ X_TEMP.X_NET_Form_params = {
 					
 				target = target === '_self' ? '_parent' : target === '_blank' ? '_self' : target,
 				html   = [
-					'<form method="', X_NET_Form_escapeQuote( option[ 'method' ] || 'GET' ), 
-						'" action="', X_NET_Form_escapeQuote( option[ 'url' ] || '' ), 
-						'" target="', X_NET_Form_escapeQuote( target || '_self' ),
-						'">' ],
-				k;
+					'<form method="', X_FormSender_escapeQuote( option[ 'method' ] || 'GET' ), 
+						'" action="', X_FormSender_escapeQuote( option[ 'url' ] || '' ), 
+						'" target="', X_FormSender_escapeQuote( target || '_self' ),
+						'">' ];
 				
 				if( target === '_top' || target === '_parent' ) this.isJump = true;
 				if( 0 <= option[ 'timeout' ] ) this.timeout = option[ 'timeout' ];
 				
 				for( k in params ){
 					// TODO 使用すべきでない name
-					html.push( '<input type="hidden" name="', X_NET_Form_escapeQuote( k ), '" value="', X_NET_Form_escapeQuote( params[ k ] || '' ), '">' );
+					html.push( '<input type="hidden" name="', X_FormSender_escapeQuote( k ), '" value="', X_FormSender_escapeQuote( params[ k ] || '' ), '">' );
 				};
 				
 				html.push( '</form><script>document.forms[0].submit();</script>' );
 				
-				X_NET_FormWrapper
+				X_FormSender
 					[ 'refresh' ]( html.join( '' ) )
-					[ 'listen' ]( [ 'ninjaload', 'ninjaerror' ], X_NET_Form_iframeListener );
+					[ 'listen' ]( [ 'ninjaload', 'ninjaerror' ], X_FormSender_iframeListener );
 							
-				X_NET_FormWrapper._busy = true;
+				X_FormSender._busy = true;
 			},
 			
 			cancel : function(){
-				X_NET_FormWrapper.reset();
-				X_NET_FormWrapper._canceled = true;
+				X_FormSender.reset();
+				X_FormSender._canceled = true;
 			},
 			
 			reset : function(){
-				X_NET_FormWrapper._busy = X_NET_FormWrapper._canceled = false;
-				X_NET_FormWrapper[ 'unlisten' ]( [ 'ninjaload', 'ninjaerror' ], X_NET_Form_iframeListener );
-				X_NET_FormWrapper[ 'refresh' ]( '' );
-				X_NET_Form_errorTimerID && X_Timer_remove( X_NET_Form_errorTimerID );
-				X_NET_Form_errorTimerID = X_Net_Form_onloadCount = 0;
+				X_FormSender._busy = X_FormSender._canceled = false;
+				X_FormSender[ 'unlisten' ]( [ 'ninjaload', 'ninjaerror' ], X_FormSender_iframeListener );
+				X_FormSender[ 'refresh' ]( '' );
+				X_FormSender_errorTimerID && X_Timer_remove( X_FormSender_errorTimerID );
+				X_FormSender_errorTimerID = X_FormSender_onloadCount = 0;
 			}
 		};
 
-function X_NET_Form_iframeListener( e ){
+function X_FormSender_iframeListener( e ){
 	var idoc;
 	
 	switch( e.type ){
@@ -80,20 +81,20 @@ function X_NET_Form_iframeListener( e ){
 				return;
 			};
 			
-			if( ++X_Net_Form_onloadCount === 1 ){
-				X_NET_Form_errorTimerID = X_NET_FormWrapper[ 'asyncDispatch' ]( this.timeout, X_EVENT_ERROR );
+			if( ++X_FormSender_onloadCount === 1 ){
+				X_FormSender_errorTimerID = X_FormSender[ 'asyncDispatch' ]( this.timeout, X_EVENT_ERROR );
 
 				// TODO レスポンスの html にアクセスしたい場合
 				// TODO samedomain or xiframe-sender
 				
 				idoc = this[ '_rawObject' ].contentDocument || this._iwin.document,
 				
-				X_NET_FormWrapper[ 'asyncDispatch' ]( { type : X_EVENT_SUCCESS, response : idoc && idoc.body ? idoc.body.innerHTML : '' } );
+				X_FormSender[ 'asyncDispatch' ]( { type : X_EVENT_SUCCESS, response : idoc && idoc.body ? idoc.body.innerHTML : '' } );
 			};
 			break;
 		case 'ninjaerror' :
 			console.log( 'iframe onerror' );
-			X_NET_FormWrapper[ 'asyncDispatch' ]( X_EVENT_ERROR );
+			X_FormSender[ 'asyncDispatch' ]( X_EVENT_ERROR );
 			break;
 	};
 	return X_CALLBACK_UN_LISTEN;