X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F06_net%2F00_XNet.js;h=4d9619296f3c64448b7e723bfd15cc162bb1061e;hb=0660e56af40d5df36e49c7a2deb7ec7e6638df98;hp=c07732637d9a91debc7f2d5d5b2eec20f3982be4;hpb=9e30a8480de03f0b36d2411a0ecb7f1d0f47b61f;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/06_net/00_XNet.js b/0.6.x/js/06_net/00_XNet.js
index c077326..4d96192 100644
--- a/0.6.x/js/06_net/00_XNet.js
+++ b/0.6.x/js/06_net/00_XNet.js
@@ -3,38 +3,62 @@
 
 // http://bugs.jquery.com/ticket/2709
 // <head><base> ãããå ´åã<script>ã®è¿½å ã«å¤±æãã
-X.Net = {
+X[ 'Net' ] = {
 
-	xhrGet : function( url, type ){
-		return new X_NET_Queue( X_NET_TYPE_XHR, { method : 'GET', url : url, type : type } );
+	'xhrGet' : function( url, obj ){
+		if( X_Type_isString( url ) ){
+			if( obj ){
+				obj[ 'url' ] = url;
+			} else {
+				obj = { 'url' : url };
+			};
+		} else {
+			obj = url;
+		};
+		obj[ 'method' ] = 'GET';
+		return new X_NET_Queue( X_NET_TYPE_XHR, obj );
 	},
 	
-	xhrPost : function( url, type, postbody ){
-		return new X_NET_Queue( X_NET_TYPE_XHR, { method : 'POST', url : url, type : type, postbody : postbody } );
+	'xhrPost' : function( url, postbody, obj ){
+		if( X_Type_isString( url ) ){
+			if( obj ){
+				obj[ 'url' ] = url;
+			} else {
+				obj = { 'url' : url };
+			};
+		} else {
+			obj = url;
+		};
+		obj[ 'method' ] = 'POST';
+		obj[ 'postbody' ] = postbody;
+		return new X_NET_Queue( X_NET_TYPE_XHR, obj );
 	},
 	
-	formGet : function(){
+	'formGet' : function(){
 		
 	},
 	
-	formPost : function(){
+	'formPost' : function(){
 		
 	},
 	
 	// TODO chashe
 	// TODO iframe useful or not. TODO dynamicIframe
 	// TODO file: ã§ã¯ãhttp: ã¯ä½¿ããªã
-	jsonp : function( url, useIframe ){
+	'jsonp' : function( url, useIframe ){
 		return new X_NET_Queue( X_NET_TYPE_JSONP, url );
 	},
 	
-	image : function( url, needSize, delay, timeout ){
+	'image' : function( url, needSize, delay, timeout ){
 		return new X_NET_Queue( X_NET_TYPE_IMAGE, { url : url, needSize : needSize } );
 	},
 	
+	'gadget' : function( obj ){
+		return new X_NET_Queue( 5, obj );
+	},
 	// <script>, <link>
 	
-	amountQueue : function(){
+	'amountQueue' : function(){
 		return X_NET_QUEUE_LIST.length;
 	}
 
@@ -60,38 +84,49 @@ var X_NET_TYPE_XHR   = 1,
 	X_NET_JSONPWrapper,
 	X_NET_FormWrapper,
 	X_NET_ImageWrapper,
+	X_NET_GIMRWrapper,
 
 	X_NET_currentWrapper,
-	X_NET_currentQueue,
+	X_NET_currentQueue;
 
-	X_NET_Queue = X.EventDispatcher.inherits(
+/**
+ * ãã¬ã¼ã ã¯ã¼ã¯ã«ãã£ã¦ã©ããããããããã¯ã¼ã¯æ©è½ã«ã¢ã¯ã»ã¹ããããã®ã¯ã©ã¹ã
+ *	
+ * @alias X_NET_Queue
+ * @class X_NET_Queue
+ * @constructs X_NET_Queue
+ * @extends {EventDispatcher}
+ */
+var X_NET_Queue = X_EventDispatcher[ 'inherits' ](
 		'XNetQueue',
-		X.Class.POOL_OBJECT,
+		X_Class.POOL_OBJECT,
+		
+		/** @lends X_NET_Queue.prototype */
 		{
 			type : 0,
 			data : null,
 			
-			Constructor : function( type, data ){
+			'Constructor' : function( type, data ){
 				this.type = type;
-				this.data = data;				
+				this.data = data;
 				
-				//this.listenOnce( X.Event.COMPLETE, X_NET_proxyDispatch );
-				X_EventDispatcher_systemListen( this, X.Event.COMPLETE, X_NET_proxyDispatch );
+				//this[ 'listenOnce' ]( X_EVENT_COMPLETE, X_NET_proxyDispatch );
+				X_EventDispatcher_systemListen( this, X_EVENT_COMPLETE, X_NET_proxyDispatch );
 				
 				X_NET_QUEUE_LIST[ X_NET_QUEUE_LIST.length ] = this;
 				!X_NET_currentQueue && X_NET_shiftQueue();
 			},
 			
-			busy : function(){
+			'busy' : function(){
 				return this === X_NET_currentQueue && X_NET_currentWrapper._busy;
 			},
 			
-			cancel : function(){
+			'cancel' : function(){
 				var i = X_NET_QUEUE_LIST.indexOf( this );
 				if( i !== -1 ){
 					X_NET_QUEUE_LIST.splice( i, 1 );
-					this.asyncDispatch( X.Event.CANCELED );
-					this.asyncDispatch( 16, X.Event.COMPLETE );
+					this[ 'asyncDispatch' ]( X_EVENT_CANCELED );
+					this[ 'asyncDispatch' ]( 16, X_EVENT_COMPLETE );
 				} else
 				if( this === X_NET_currentQueue ){
 					X_NET_currentWrapper.cancel();
@@ -102,24 +137,24 @@ var X_NET_TYPE_XHR   = 1,
 
 function X_NET_proxyDispatch( e ){
 	switch( e.type ){
-		case X.Event.BEFORE_KILL_INSTANCE :
+		case X_EVENT_BEFORE_KILL_INSTANCE :
 			break;
-		case X.Event.KILL_INSTANCE :
+		case X_EVENT_KILL_INSTANCE :
 			break;			
-		case X.Event.KILL_INSTANCE_CANCELED :
+		case X_EVENT_KILL_INSTANCE_CANCELED :
 			break;
-		case X.Event.PROGRESS :
-			this.dispatch( e );
+		case X_EVENT_PROGRESS :
+			this[ 'dispatch' ]( e );
 			break;
-		case X.Event.SUCCESS :
-		case X.Event.ERROR :
-		case X.Event.TIMEOUT :
-		case X.Event.CANCELED :
-			this.dispatch( e );
-			this.asyncDispatch( X.Event.COMPLETE );
+		case X_EVENT_SUCCESS :
+		case X_EVENT_ERROR :
+		case X_EVENT_TIMEOUT :
+		case X_EVENT_CANCELED :
+			this[ 'dispatch' ]( e );
+			this[ 'asyncDispatch' ]( X_EVENT_COMPLETE );
 			break;
-		case X.Event.COMPLETE :
-			this.kill();
+		case X_EVENT_COMPLETE :
+			this[ 'kill' ]();
 			X_NET_shiftQueue();
 			break;
 	};
@@ -132,7 +167,7 @@ function X_NET_shiftQueue(){
 		console.log( 'X_NET_shiftQueue ' + X_NET_currentWrapper._busy );
 		if( X_NET_currentWrapper._busy ) return;
 		X_NET_currentWrapper
-			.unlisten( [ X.Event.PROGRESS, X.Event.SUCCESS, X.Event.ERROR, X.Event.TIMEOUT, X.Event.CANCELED ], X_NET_currentQueue, X_NET_proxyDispatch )
+			[ 'unlisten' ]( [ X_EVENT_PROGRESS, X_EVENT_SUCCESS, X_EVENT_ERROR, X_EVENT_TIMEOUT, X_EVENT_CANCELED ], X_NET_currentQueue, X_NET_proxyDispatch )
 			.reset();
 		X_NET_currentQueue = X_NET_currentWrapper = null;
 	};
@@ -146,7 +181,7 @@ function X_NET_shiftQueue(){
 			X_NET_currentWrapper = X_NET_XHRWrapper;
 			break;
 		case X_NET_TYPE_JSONP :
-			X_NET_currentWrapper = X_NET_JSONPWrapper;
+			X_NET_currentWrapper = X_NET_JSONPWrapper; // X_NET_JSONPWrapper || createJSONPWrapper
 			break;
 		case X_NET_TYPE_FORM :
 			X_NET_currentWrapper = X_NET_FormWrapper;
@@ -154,9 +189,12 @@ function X_NET_shiftQueue(){
 		case X_NET_TYPE_IMAGE :
 			X_NET_currentWrapper = X_NET_ImageWrapper;
 			break;
+		case 5 :
+			X_NET_currentWrapper = X_NET_GIMRWrapper;
+			break;
 	};
 	
-	X_NET_currentWrapper.listen( [ X.Event.PROGRESS, X.Event.SUCCESS, X.Event.ERROR, X.Event.TIMEOUT, X.Event.CANCELED ], X_NET_currentQueue = queue, X_NET_proxyDispatch );
+	X_NET_currentWrapper[ 'listen' ]( [ X_EVENT_PROGRESS, X_EVENT_SUCCESS, X_EVENT_ERROR, X_EVENT_TIMEOUT, X_EVENT_CANCELED ], X_NET_currentQueue = queue, X_NET_proxyDispatch );
 	
 	X_NET_currentWrapper.load( queue.data );
 };
