From: itozyun <itozyun@user.sourceforge.jp>
Date: Thu, 30 Apr 2015 15:35:44 +0000 (+0900)
Subject: Version 0.6.144, fix Gesture for iOS4, fix Node.css, fix X.Net.
X-Git-Url: http://git.osdn.jp/view?p=pettanr%2FclientJs.git;a=commitdiff_plain;h=36f999435e807f3d04f899b2a84eb1dc31df34b7

Version 0.6.144, fix Gesture for iOS4, fix Node.css, fix X.Net.
---

diff --git a/0.6.x/js/01_core/09_XPair.js b/0.6.x/js/01_core/09_XPair.js
new file mode 100644
index 0000000..60fb3dc
--- /dev/null
+++ b/0.6.x/js/01_core/09_XPair.js
@@ -0,0 +1,76 @@
+X[ 'Pair' ] = {
+	'create'  : X_Pair_create,
+	
+	'get'     : X_Pair_get,
+	
+	'release' : X_Pair_release
+};
+
+var X_Pair_SIZE            = 1000,
+	X_Pair_KEY_STORE_LIST  = [[]],
+	X_Pair_PAIR_STORE_LIST = [[]],
+	X_Pair_functionString  = new Function( 's', 'p', 'k', (function(){
+		var ret = 'var i=0,l=s.length,a;' +
+				  'for(;i<l;++i){' +
+				  'a=s[i];' +
+				  'switch(k){',
+			j = 0, hex;
+		for( ; j < X_Pair_SIZE; ++j ){
+			hex = j.toString( 16 );
+			ret += 'case a[0x' + hex + ']:return p[i][0x' + hex + '];';
+		};
+		return ret + '}}';
+	})()),
+	X_Pair_noChashe = false,
+	
+	// TODO キャッシュするペアの数とヒット率、探索時間の記録
+	X_Pair_lastKey, X_Pair_lastPair;
+
+function X_Pair_create( key, pair ){
+	var keyStore  = X_Pair_KEY_STORE_LIST[ X_Pair_KEY_STORE_LIST.length - 1 ],
+		pairStore = X_Pair_PAIR_STORE_LIST[ X_Pair_PAIR_STORE_LIST.length - 1 ];
+	
+	X_Pair_noChashe = true;
+	if( X_Pair_get( key ) ) return;
+	
+	if( keyStore.length === X_Pair_SIZE ){
+		keyStore  = X_Pair_KEY_STORE_LIST[ X_Pair_KEY_STORE_LIST.length   ] = [];
+		pairStore = X_Pair_PAIR_STORE_LIST[ X_Pair_PAIR_STORE_LIST.length ] = [];
+	};
+	
+	keyStore[  keyStore.length  ] = key;
+	pairStore[ pairStore.length ] = pair;
+};
+
+function X_Pair_get( key ){
+	var chashe = !X_Pair_noChashe, pair;
+	
+	X_Pair_noChashe = false;
+	if( key === X_Pair_lastKey ) return X_Pair_lastPair; // quick
+	
+	if( ( pair = X_Pair_functionString( X_Pair_KEY_STORE_LIST, X_Pair_PAIR_STORE_LIST, key ) ) && chashe ){
+		X_Pair_lastKey  = key;
+		X_Pair_lastPair = pair;
+	};
+	return pair;
+};
+
+function X_Pair_release( key, opt_pair ){
+	var i = 0,
+		l = X_Pair_KEY_STORE_LIST.length,
+		keyStore, pairStore, j;
+	
+	for( ; i < l; ++i ){
+		keyStore  = X_Pair_KEY_STORE_LIST[ i ];
+		pairStore = X_Pair_PAIR_STORE_LIST[ i ];
+		j = keyStore.indexOf( key );
+		if( j !== -1 && ( opt_pair === undefined || pairStore[ j ] === opt_pair ) ){
+			keyStore.splice( j, 1 );
+			pairStore.splice( j, 1 );
+			if( X_Pair_lastKey === key ){
+				X_Pair_lastKey = X_Pair_lastPair = null;
+			};
+			break;
+		};
+	};
+};
diff --git a/0.6.x/js/01_core/14_XTimer.js b/0.6.x/js/01_core/14_XTimer.js
index 741d12c..c6d8378 100644
--- a/0.6.x/js/01_core/14_XTimer.js
+++ b/0.6.x/js/01_core/14_XTimer.js
@@ -407,7 +407,7 @@ if( X_UA[ 'iOS' ] ){
 			X_Timer_timeStamp = now;
 			X_Timer_waitTime  = last / X_Timer_INTERVAL_TIME | 0;
 		};
-		X_ViewPort[ 'getScrollPosition' ](); // X_DomEvent　のための X_ViewPort_scrollX & Y の更新、
+		X[ 'ViewPort' ][ 'getScrollPosition' ](); // X_DomEvent　のための X_ViewPort_scrollX & Y の更新、
 	});
 };
 
diff --git a/0.6.x/js/02_dom/02_XNode.js b/0.6.x/js/02_dom/02_XNode.js
index b432339..451ea0e 100644
--- a/0.6.x/js/02_dom/02_XNode.js
+++ b/0.6.x/js/02_dom/02_XNode.js
@@ -1199,16 +1199,13 @@ function X_Node_call( name /*, opt_args... */ ){
 	switch( name ){
 		case 'nodeType' :
 			return this[ '_tag' ] ? 1 : 3;
-		case 'text' :
-			return this[ 'text' ]();
-		case 'html' :
-		case 'innerHTML' :
-			return this[ 'html' ]();
 		case 'outerHTML' :
 			X_Node_outerXNode = X_Node_body; // == true ならなんでもよい。型を合わすために xbody にしている
 			v = this[ 'html' ]();
 			X_Node_outerXNode = null;
 			return v;
+		case 'treeIsDirty' :
+			return !!X_Node_updateTimerID;
 		case 'fontSize' :
 			return X_Node_CSS_getCharSize( this );
 		case 'inGPU' :
diff --git a/0.6.x/js/02_dom/06_XNodeCSS.js b/0.6.x/js/02_dom/06_XNodeCSS.js
index 4f22524..31fee5c 100644
--- a/0.6.x/js/02_dom/06_XNodeCSS.js
+++ b/0.6.x/js/02_dom/06_XNodeCSS.js
@@ -524,8 +524,9 @@ Node.prototype[ 'css' ] = function( nameOrObj /* orUnitID, valuOrUnitOrName */ )
 			if( css[ name ] === v ) continue;
 			flags = X_Node_CSS_setStyle( css, flags, name, v );
 		};
-		this[ '_flags' ] |= X_Node_State.DIRTY_CSS | X_Node_State.OLD_CSSTEXT;
-		this[ '_flags' ] & X_Node_State.IN_TREE && X_Node_reserveUpdate();
+		flags |= X_Node_State.DIRTY_CSS | X_Node_State.OLD_CSSTEXT;
+		this[ '_flags' ] = flags;
+		flags & X_Node_State.IN_TREE && X_Node_reserveUpdate();
 		delete this[ '_cssText' ];
 		return this;
 	} else
@@ -560,6 +561,7 @@ function X_Node_CSS_setStyle( css, flags, name, newValue ){
 	
 	switch( name ){
 		case 'display' :
+			console.log( newValue );
 			newValue === 'none' ? ( flags |= X_Node_State.STYLE_IS_DISPLAY_NONE ) : ( flags &= ~X_Node_State.STYLE_IS_DISPLAY_NONE );
 			return flags;
 			
diff --git a/0.6.x/js/02_dom/10_XNodeAnime.js b/0.6.x/js/02_dom/10_XNodeAnime.js
index 839697a..0b5a8a8 100644
--- a/0.6.x/js/02_dom/10_XNodeAnime.js
+++ b/0.6.x/js/02_dom/10_XNodeAnime.js
@@ -329,6 +329,9 @@ function X_Node_Anime_updateAnimation( xnode ){
 			
 		case 3 : // アニメーションの解除
 			obj.phase = obj.gpuParent ? 10 : 4;
+			
+			console.log( '#### アニメーションの解除 ' + obj.phase );
+			
 			// このタイミングで animation 関連の css を削除したところ(X_Node_Anime_clearTransition)、iOS3、4 で再描画忘れが度々起きるように、、、
 			if( !obj.gpuParent ) X_Node_Anime_clearTransition( xnode );
 			//xnode[ 'dispatch' ]( { type : X_EVENT_ANIME_END, 'gpu' : obj.gpuParent } );
@@ -343,6 +346,7 @@ function X_Node_Anime_updateAnimation( xnode ){
 			// アニメーションは停止・GPUレイヤーは解除していない(再アニメーションに備えて待機)
 			//X_Node_Anime_clearTransition( xnode ); // TODO X_Node_Anime_releaseGPULayer に移動?
 			if( !obj.gpuTimerID ){
+				console.log( '#### アニメーションは停止 ' + obj.wait );
 				if( obj.wait ){
 					obj.gpuTimerID = X_Timer_once( obj.wait, xnode, X_Node_Anime_releaseGPULayer );
 				} else {
@@ -430,12 +434,12 @@ function X_Node_Anime_onTransitionEnd( e ){
 	
 	this[ '_anime' ].phase = 3;
 	
+	X_Node_Anime_clearTransition( this ); // X_EVENT_ANIME_END より前で呼んでおく
+	
 	X_Node_Anime_onTransition = true;
 	this[ 'dispatch' ]( { type : X_EVENT_ANIME_END, 'gpu' : this[ '_anime' ].gpuParent } );
 	X_Node_Anime_onTransition = false;
 	
-	X_Node_Anime_clearTransition( this ); // iOS 大丈夫？？
-	
 	X_Node_Anime_needsDetection = true;
 	// iOS は transitionend 内の 更新でアニメーション可能 iOS3, iOS4 で確認 
 	// win+Gecko は不可
@@ -455,7 +459,7 @@ function X_Node_Anime_releaseGPULayer(){
 	X_Node_ANIMATIONS.splice( X_Node_ANIMATIONS.indexOf( this ), 1 );
 	delete obj.gpuTimerID;
 	delete this[ '_anime' ];
-	//console.log( 'GPUレイヤーの破棄を指示' );
+	console.log( 'GPUレイヤーの破棄を指示' );
 	
 	X_ViewPort[ 'listenOnce' ]( X_EVENT_AFTER_UPDATE, this, X_Node_Anime_gpuReleased );
 };
diff --git a/0.6.x/js/05_util/01_XNinjaIframe.js b/0.6.x/js/05_util/01_XNinjaIframe.js
index f400818..b3cb362 100644
--- a/0.6.x/js/05_util/01_XNinjaIframe.js
+++ b/0.6.x/js/05_util/01_XNinjaIframe.js
@@ -72,7 +72,7 @@ X[ 'Util' ][ 'NinjaIframe' ] = Node[ 'inherits' ](
 				this._iwin.location.reload();
 			};
 			
-			if( !opt_contentHTML ) return this;
+			if( !opt_contentHTML && opt_contentHTML !== '' ) return this;
 			
 			this._contentHTML = opt_contentHTML;
 			X_UA[ 'IE' ] < 9 || X_Util_NinjaIframe_writeToIframe( this );
@@ -103,7 +103,7 @@ function X_Util_NinjaIframe_handleEvent( e ){
 			this[ 'listen' ]( [ X_UA[ 'IE' ] < 9 ? 'readystatechange' : 'load', 'error' ], this, X_Util_NinjaIframe_handleEvent );
 			
 			if( !( X_UA[ 'IE' ] < 9 ) ){
-				this._contentHTML && X_Util_NinjaIframe_writeToIframe( this );
+				( this._contentHTML || this._contentHTML === '' ) && X_Util_NinjaIframe_writeToIframe( this );
 				this._ready = true;
 				return;
 			};
@@ -113,18 +113,18 @@ function X_Util_NinjaIframe_handleEvent( e ){
 			if( ( raw.readyState !== 'complete' && raw.readyState !== 'loaded' ) ) break;
 			// ie9-
 			if( !this._ready ){
-				this._contentHTML && X_Util_NinjaIframe_writeToIframe( this );
+				( this._contentHTML || this._contentHTML === '' ) && X_Util_NinjaIframe_writeToIframe( this );
 				this._ready = true;
 				break;
 			};
 			// onload
 		case 'load' :
 			console.log( 'iframe load.' );
-			this[ 'asyncDispatch' ]( X_EVENT_SUCCESS );
+			this[ 'asyncDispatch' ]( 'ninjaload' );
 			break;
 
 		case 'error' :
-			this[ 'asyncDispatch' ]( X_EVENT_ERROR );
+			this[ 'asyncDispatch' ]( 'ninjaerror' );
 			break;
 	};
 	
diff --git a/0.6.x/js/06_net/00_XNet.js b/0.6.x/js/06_net/00_XNet.js
index 4d96192..e7a6762 100644
--- a/0.6.x/js/06_net/00_XNet.js
+++ b/0.6.x/js/06_net/00_XNet.js
@@ -3,137 +3,175 @@
 
 // http://bugs.jquery.com/ticket/2709
 // <head><base> がある場合、<script>の追加に失敗する
-X[ 'Net' ] = {
-
-	'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, 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(){
-		
-	},
-	
-	'formPost' : function(){
-		
-	},
-	
-	// TODO chashe
-	// TODO iframe useful or not. TODO dynamicIframe
-	// TODO file: では　http: は使えない
-	'jsonp' : function( url, useIframe ){
-		return new X_NET_Queue( X_NET_TYPE_JSONP, url );
-	},
-	
-	'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(){
-		return X_NET_QUEUE_LIST.length;
-	}
-
-};
-
-/*
- * @interface
- */
-var X_NET_IWrapper = function(){};
-	X_NET_IWrapper.prototype.load   = function(){};
-	X_NET_IWrapper.prototype.cancel = function(){};
-	X_NET_IWrapper.prototype.reset  = function(){};
-
-
-var X_NET_TYPE_XHR   = 1,
-	X_NET_TYPE_JSONP = 2,
-	X_NET_TYPE_FORM  = 3,
-	X_NET_TYPE_IMAGE = 4,
-
-	X_NET_QUEUE_LIST = [],
-
-	X_NET_XHRWrapper,
-	X_NET_JSONPWrapper,
-	X_NET_FormWrapper,
-	X_NET_ImageWrapper,
-	X_NET_GIMRWrapper,
-
-	X_NET_currentWrapper,
-	X_NET_currentQueue;
 
 /**
- * フレームワークによってラップされたネットワーク機能にアクセスするためのクラス。
- *	
- * @alias X_NET_Queue
- * @class X_NET_Queue
- * @constructs X_NET_Queue
+ * cancel(), busy() メソッドだけを持つ。X.Pair によって、プライベートメンバは隠蔽される。X_EVENT_PROGRESS, X_EVENT_SUCCESS, X_EVENT_ERROR, X_EVENT_TIMEOUT, X_EVENT_CANCELED
+ * 
+ * @alias X.Net
+ * @class 各種ネットワーク機能をラップしインターフェイスを共通化する。
+ * @constructs Net
  * @extends {EventDispatcher}
+ * @example // XHR - GET
+ * var net = X.Net( { xhr : urlString } )
+ * 		.listenOnce( X.Event.PROGRESS );
+ * 		.listen( [ X.Event.SUCCESS, X.Event.ERROR, X.Event.TIMEOUT, X.Event.CANCELED ] );
+ * 
+ * // XHR - POST 
+ * var net = X.Net( { xhr : urlString, postbody : myData } );
+ * 
+ * // JSONP
+ * var net = X.Net( { jsonp : urlString, staticCallbackName : callbackName, useXDomainWall : false } );
+ * 
+ * // Image preload & getSize
+ * var net = X.Net( { image : src, sizeDetection : true } );
+ * 
+ * // load <script>, <link>
  */
-var X_NET_Queue = X_EventDispatcher[ 'inherits' ](
-		'XNetQueue',
-		X_Class.POOL_OBJECT,
+X[ 'Net' ] = X_EventDispatcher[ 'inherits' ](
+		'X.Net',
+		X_Class.NONE,
 		
-		/** @lends X_NET_Queue.prototype */
 		{
-			type : 0,
-			data : null,
-			
-			'Constructor' : function( type, data ){
-				this.type = type;
-				this.data = data;
+			'Constructor' : function( urlOrObject, opt_options ){
+				var v, opt;
+				
+				if( X_Type_isObject( opt = urlOrObject ) ){
+					if( v = opt[ 'xhr' ] ){
+						url  = v;
+						type = X_NET_TYPE_XHR;
+					} else
+					if( v = opt[ 'jsonp' ] ){
+						url  = v;
+						type = X_NET_TYPE_JSONP;
+					} else
+					if( v = opt[ 'img' ] || opt[ 'image' ] ){
+						url  = v;
+						type = X_NET_TYPE_IMAGE;
+					} else
+					if( v = opt[ 'form' ] ){
+						url  = v;
+						type = X_NET_TYPE_FORM;
+					} else
+					if( v = opt[ 'type' ] ){
+
+						switch( v ){
+							case 'xhr' :
+								type = X_NET_TYPE_XHR;
+								break;
+							case 'jsonp' :
+								type = X_NET_TYPE_JSONP;
+								break;
+							case 'img' :
+							case 'image' :
+								type = X_NET_TYPE_IMAGE;
+								break;
+							case 'from' :
+								type = X_NET_TYPE_FORM;
+								break;
+							default :
+								alert( 'X.Net args error' );
+								return;	
+						};
+						
+						if( X_Type_isString( url = opt[ 'url' ] ) ){
+							alert( 'X.Net args error' );
+							return;
+						};
+						
+					} else {
+						alert( 'X.Net args error' );
+						return;
+					};
+					
+				} else
+				if( X_Type_isString( urlOrObject ) ){
+					url = urlOrObject;
+					
+					if( X_Type_isObject( opt = opt_options ) ){
+						type = opt[ 'type' ] || X_NET_TYPE_XHR;
+					} else {
+						type = X_NET_TYPE_XHR;
+						opt  = { 'url' : url, 'method' : 'GET' };
+					};
+					
+				} else {
+					alert( 'X.Net args error' );
+					return;
+				};
 				
-				//this[ 'listenOnce' ]( X_EVENT_COMPLETE, X_NET_proxyDispatch );
-				X_EventDispatcher_systemListen( this, X_EVENT_COMPLETE, X_NET_proxyDispatch );
+				if( type === X_NET_TYPE_XHR ){
+					opt[ 'method' ] = opt[ 'method' ] || ( opt[ 'postbody' ] ? 'POST' : 'GET' );
+					
+					// XDomain -> Flash, Gears, Silverlight に切替?
+				};				
+				
+				opt = X_Object_clone( opt );
+				opt[ 'type' ] = type;
+				opt[ 'url'  ] = url;
+				
+				X_Pair_create( this, opt );
+				
+				this[ 'listenOnce' ]( X_EVENT_COMPLETE, X_NET_proxyDispatch );
 				
 				X_NET_QUEUE_LIST[ X_NET_QUEUE_LIST.length ] = this;
 				!X_NET_currentQueue && X_NET_shiftQueue();
 			},
 			
+		/**
+		 * オブジェクトが現在通信中か？
+		 * @alias Net.prototype.budy
+		 * @return {boolean}
+		 */
 			'busy' : function(){
 				return this === X_NET_currentQueue && X_NET_currentWrapper._busy;
 			},
-			
+
+		// TODO -> kill
+		/**
+		 * 通信のキャンセル
+		 * @alias Net.prototype.cancel
+		 * @return {Net} 自身を返す、メソッドチェーン
+		 */
 			'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[ 'listenOnce' ]( X_EVENT_COMPLETE, X_NET_proxyDispatch );
 				} else
 				if( this === X_NET_currentQueue ){
 					X_NET_currentWrapper.cancel();
 				};
+				return this;
 			}
 		}
 	);
+/*
+ * @interface
+ */
+var X_NET_IWrapper = function(){};
+	X_NET_IWrapper.prototype.load   = function(){};
+	X_NET_IWrapper.prototype.cancel = function(){};
+	X_NET_IWrapper.prototype.reset  = function(){};
+
+
+var X_NET_TYPE_XHR   = 1,
+	X_NET_TYPE_JSONP = 2,
+	X_NET_TYPE_FORM  = 3,
+	X_NET_TYPE_IMAGE = 4,
+
+	X_NET_QUEUE_LIST = [],
+
+	X_NET_XHRWrapper,
+	X_NET_JSONPWrapper,
+	X_NET_FormWrapper,
+	X_NET_ImageWrapper,
+	X_NET_GIMRWrapper,
+
+	X_NET_currentWrapper,
+	X_NET_currentQueue,
+	X_NET_currentData;
 
 function X_NET_proxyDispatch( e ){
 	switch( e.type ){
@@ -151,9 +189,11 @@ function X_NET_proxyDispatch( e ){
 		case X_EVENT_TIMEOUT :
 		case X_EVENT_CANCELED :
 			this[ 'dispatch' ]( e );
-			this[ 'asyncDispatch' ]( X_EVENT_COMPLETE );
+			this[ 'asyncDispatch' ]( { type : X_EVENT_COMPLETE, 'lastEventType' : e.type } );
+			// this[ 'listenOnce' ]( X_EVENT_COMPLETE, X_NET_proxyDispatch );
 			break;
 		case X_EVENT_COMPLETE :
+			X_Pair_release( this );
 			this[ 'kill' ]();
 			X_NET_shiftQueue();
 			break;
@@ -161,41 +201,41 @@ function X_NET_proxyDispatch( e ){
 };
 
 function X_NET_shiftQueue(){
-	var queue;
-	
+
 	if( X_NET_currentQueue ){
 		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 )
 			.reset();
-		X_NET_currentQueue = X_NET_currentWrapper = null;
+		X_NET_currentQueue = X_NET_currentWrapper = X_NET_currentData = null;
 	};
 	
 	if( !X_NET_QUEUE_LIST.length ) return;
 
-	queue = X_NET_QUEUE_LIST.shift();
+	X_NET_currentQueue = X_NET_QUEUE_LIST.shift();
+	X_NET_currentData  = X_Pair_get( X_NET_currentQueue );
 	
-	switch( queue.type ){
+	switch( X_NET_currentData.type ){
 		case X_NET_TYPE_XHR :
-			X_NET_currentWrapper = X_NET_XHRWrapper;
+			X_NET_currentWrapper = X_NET_XHRWrapper   || X_TEMP.X_Net_XHR_init();
 			break;
 		case X_NET_TYPE_JSONP :
-			X_NET_currentWrapper = X_NET_JSONPWrapper; // X_NET_JSONPWrapper || createJSONPWrapper
+			X_NET_currentWrapper = X_NET_JSONPWrapper || X_TEMP.X_NET_JSONP_init();
 			break;
 		case X_NET_TYPE_FORM :
 			X_NET_currentWrapper = X_NET_FormWrapper;
 			break;
 		case X_NET_TYPE_IMAGE :
-			X_NET_currentWrapper = X_NET_ImageWrapper;
+			X_NET_currentWrapper = X_NET_ImageWrapper || X_TEMP.X_NET_Image_init();
 			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, X_NET_proxyDispatch );
 	
-	X_NET_currentWrapper.load( queue.data );
+	X_NET_currentWrapper.load( X_NET_currentData );
 };
 
diff --git a/0.6.x/js/06_net/01_XNetXHR.js b/0.6.x/js/06_net/01_XNetXHR.js
index 2095b96..1dc2d5a 100644
--- a/0.6.x/js/06_net/01_XNetXHR.js
+++ b/0.6.x/js/06_net/01_XNetXHR.js
@@ -49,7 +49,9 @@ var // Opera7.6+, Safari1.2+, khtml3.?+, Gecko0.9.7+
 				'return[v[++i],new ActiveXObject(n[i])]',
 			'}catch(e){}',
 		'}'
-	].join( '' ) ) )();
+	].join( '' ) ) )(),
+	
+	X_Net_XHR_init;
 
 if( X_Net_XHR_ACTIVE_X ){
 	X_Net_XHR_VERSION  = X_Net_XHR_ACTIVE_X[ 0 ];
@@ -79,6 +81,10 @@ X[ 'Net' ][ 'XHR' ] = {
 };
 
 if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
+
+X_TEMP.X_Net_XHR_init = function(){
+	
+	delete X_TEMP.X_Net_XHR_init;
 	
 	X_NET_XHRWrapper = X_Class_override(
 		X_EventDispatcher(),
@@ -219,27 +225,11 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
 				
 
 				raw.send( postbody || '' );
-				//this._timerID = X_Timer_once( 16, this, this._lazySend, [ postbody || '', timeout ] );
 			},
-			/*
-			// send() 内で onload するケースがあり、そのときはイベントリスナが間に合わないので、タイマーをかませる。
-			_lazySend : function( postbody, timeout ){
-				if( this[ '_rawObject' ].timeout === undefined ){
-					this._timerID = X_Timer_once( timeout, this, this.onTimeout );
-				} else {
-					this._timerID = 0;
-				};
-				
-				// http://allabout.co.jp/gm/gc/24097/#1
-				// sendをonreadystatechangeの前に記述すると、ieでは動作しなくなります、、、。
-				// konquerorでエラーが発生するのでここでは、とりあえず、send('') としました。
-				this[ '_rawObject' ].send( postbody );				
-			}, */
 			
 			cancel : function(){
 				/* X.Net.XHR.CANCELABLE && */ this[ '_rawObject' ].abort && this[ '_rawObject' ].abort();
 				this._canceled = true;
-				this[ 'asyncDispatch' ]( X_EVENT_CANCELED );
 			},
 			
 			reset : function(){
@@ -447,5 +437,9 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
 	if( X_Net_XHR_upload ){
 		X_NET_XHRWrapper[ '_rawObject' ].upload.addEventListener( 'progress', X_NET_XHRWrapper.onUploadProgress );
 	};
+	
+	return X_NET_XHRWrapper;
+};
+
 };
 
diff --git a/0.6.x/js/06_net/02_XNetJSONP.js b/0.6.x/js/06_net/02_XNetJSONP.js
index 21d5e36..11dd975 100644
--- a/0.6.x/js/06_net/02_XNetJSONP.js
+++ b/0.6.x/js/06_net/02_XNetJSONP.js
@@ -16,9 +16,13 @@
  * 
  * IE6(IETester,localhost) で動かない,
  * 
- * TODO postMessage
+ * TODO iframe 内を他ドメインにして jsonp のセキュリティを強化。他ドメインに jsonp を読み込んで 正しい JSON か？検証後にフレーム間通信で戻す。
  */
 
+	// TODO chashe
+	// TODO iframe useful or not. TODO check dynamicIframe
+	// TODO file: では　http: は使えない
+
 X[ 'Net' ][ 'JSONP' ] = {
 	'cb' : function( accessKey, jsonString, time, opt_json2FileSize ){
 			if( accessKey !== X_NET_JSONP_ACCESS_KEY || !X_NET_JSONPWrapper._busy ) return;
@@ -31,184 +35,180 @@ X[ 'Net' ][ 'JSONP' ] = {
 					data : window.JSON ? JSON.parse( jsonString ) : eval( 'var a=' + jsonString + ';a' )
 				} );
 			
+			X_Net_JSONP_errorTimerID && X_Timer_remove( X_Net_JSONP_errorTimerID );
+			
 			console.log( 'ms : ' + time + ' speed : ' + ( ( jsonString.length + ( opt_json2FileSize || 0 ) ) / time * 1000 ) + ' バイト/秒.' );
 		}
 };
 
-function X_Net_JSONP_reciveMessage( data ){
-	console.log( data );
-};
-
 var X_NET_JSONP_ACCESS_KEY = Math.random(),
 	
-	X_NET_JSONP_SEND_MSG_KEY = X_System.message( 'X.Net.JSONP', X_Net_JSONP_reciveMessage ),
+	X_Net_JSONP_maxOnloadCount,
 	
-	X_NET_JSONP_NinjaIframe,
+	X_Net_JSONP_onloadCount = 0,
 	
-	X_Net_JSONP_onloadCount;
+	X_Net_JSONP_errorTimerID;
 
+X_TEMP.X_NET_JSONP_init = function(){
 	
-
-function X_NET_JSONP_loadScriptInNinjaIframe( url ){
-	var json2Path     = 'js/libs/json2.js',
-		json2FileSize = 18103,
-		html;
+	delete X_TEMP.X_NET_JSONP_init;
 	
-	X_NET_JSONP_NinjaIframe || ( X_NET_JSONP_NinjaIframe = X[ 'Util' ][ 'NinjaIframe' ]() );
+	return X_NET_JSONPWrapper = X_Class_override(
+		X[ 'Util' ][ 'NinjaIframe' ](),
+		{
 	
-	// TODO '<scr'+'ipt> 化　恐らくアンチウイルスソフトが反応しないための対策
-	// TODO postMessage の利用
-	// document.postMessage()→window.postMessage() (Opera 9.50 build 9841 -)
-	// http://d.hatena.ne.jp/cnrd/20080518/1211099169
-	// 最近の仕様変更(引数のtargetOriginとかMessageEventのoriginとか)にはまだ対応してないみたい 
-
-	if( X_UA[ 'Opera' ] ){
-		html = [
-			( window[ 'JSON' ] ? '' : '<script src="' + json2Path + '"></script>' ),
-			'<script>',
-				'onunload=function(){im.onload=im.onerror=""};',
-				'nw=+new Date;',
-				'function cb(o){if(nw){nw-=+new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw', window[ 'JSON' ] ? json2FileSize : 0 ,');nw=0}}',
-			'</script>',	
-			'<script id="jp"></script>',
-			'<img id="im" src="', url, '" onload="jp.src=im.src" onerror="jp.src=im.src">'
-		];
-		X_Net_JSONP_onloadCount = 2;
-	} else
-	if( X_UA[ 'IE8' ] ){
-		html = [
-			// JavaScriptでunicode文字列をunescapeする
-			// http://perutago.seesaa.net/article/202801583.html
+			_busy         : false,
+			_canceled     : false,
 			
-			// http://blog.livedoor.jp/dankogai/archives/51503830.html		
-			// Ajax - IE8にもJSON入ってます。使えるとは限らないけど
-			// Compatibility mode (別名Quirks mode) では、JSONオブジェクトは無効になります。iframeもだめです
-			'<script id="jp"></script>',
-			'<script>',
-				'onunload=function(){clearTimeout(id)};',
-				'nw=0;', // なぜか必要,,,
-				'function cb(o){nw-=+new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',parent.JSON.stringify(o).replace(/\\\\u([a-fA-F0-9]{4})/g,function(a,b){return String.fromCharCode(parseInt(b,16))}),-nw)}',
-				//'function cb(o){if(nw){nw-=+new Date;postMessage("', X_NET_JSONP_SEND_MSG_KEY,' "+nw+"|"+parent.JSON.stringify(o).replace(/\\\\u([a-fA-F0-9]{4})/g,function(a,b){return String.fromCharCode(parseInt(b,16))}),"*");nw=0}}',			
-				'function tm(){jp.src="', url ,'";nw=+new Date}',
-				'id=setTimeout(tm,16);',
-			'</script>'
+			load : function( option ){
+				//createURL
+				var url           = option[ 'url' ],
+					json2Path     = 'js/libs/json2.js',
+					json2FileSize = 18103,
+					html;
+				
+				// TODO '<scr'+'ipt> 化　恐らくアンチウイルスソフトが反応しないための対策
+				// document.postMessage()→window.postMessage() (Opera 9.50 build 9841 -)
+				// http://d.hatena.ne.jp/cnrd/20080518/1211099169
+				// 最近の仕様変更(引数のtargetOriginとかMessageEventのoriginとか)にはまだ対応してないみたい 
 			
-			/*　以下のコードは XP ie8 では動くけど、win8 IE11(8モード)で動かない 開発の便宜を取って,setTimeout を挟む
-			'<script>',
-				'function cb(o){window.parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',window.parent.JSON.stringify(o))}',
-			'</script>',
-			'<script src="', url, '"></script>' */
-		];
-		X_Net_JSONP_onloadCount = 2;
-	} else
-	if( X_UA[ 'IE9' ] ){
-		html = [
-			'<script id="jp"></script>',
-			'<script>',
-				'onunload=function(){clearTimeout(id)};',
-				'function cb(o){nw-=+new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw)}',
-				'function tm(){jp.src="', url ,'";nw=+new Date}',
-				'id=setTimeout(tm,16);',
-			'</script>'
-		];
-		X_Net_JSONP_onloadCount = 2;
-	} else
-	if( window[ 'JSON' ] ){
-		html = [	
-			'<script>',
-				'nw=+new Date;',
-				'function cb(o){if(nw){nw-=+new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw);nw=0}}',
-				//'function cb(o){if(nw){nw-=+new Date;parent.postMessage("', X_NET_JSONP_SEND_MSG_KEY,' "+nw+"|"+JSON.stringify(o),"', location.origin, '");nw=0}}',
-			'</script>',
-			'<script src="', url, '"></script>'
-		];
-		X_Net_JSONP_onloadCount = 1;
-	} else
-	if( X_UA[ 'IE4' ] || X_UA[ 'MacIE' ] ){
-		html = [
-			'<script id="jn"></script>',
-			'<script id="jp"></script>',
-			'<script>',
-				'onunload=function(){clearTimeout(id)};',
-				'function cb(o){nw-=new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw-16,', json2FileSize, ')}',
-				'function t1(){document.all.jn.src="', json2Path ,'";id=setTimeout("t2()",16);nw=+new Date}',
-				'id=setTimeout("t1()",16);',
-				'function t2(){if(window.JSON){document.all.jp.src="', url ,'"}else{id=setTimeout("t2()",16)}}',
-			'</script>'
-		];
-		X_Net_JSONP_onloadCount = 3;
-	} else
-	if( X_UA[ 'IE' ] < 8 ){ // ie5-7
-		html = [
-			'<script id="jn"></script>',
-			'<script id="jp"></script>',
-			'<script>',
-				'onunload=function(){clearTimeout(id)};',
-				'function cb(o){nw-=new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw-16,', json2FileSize, ')}',
-				'function t1(){jn.src="', json2Path ,'";id=setTimeout(t2,16);nw=+new Date}',
-				'id=setTimeout(t1,16);',
-				'function t2(){if(window.JSON){jp.src="', url ,'"}else{id=setTimeout(t2,16)}}',
-			'</script>'
-		];
-		X_Net_JSONP_onloadCount = 3;
-	} else {
-		html = [
-			'<script>',
-				'function cb(o){if(nw){nw-=new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw,', json2FileSize, ');nw=0}}',
-				'nw=+new Date;',
-			'</script>',
-			'<script src="', json2Path, '"></script>',
-			'<script src="', url, '"></script>'
-		];
-		X_Net_JSONP_onloadCount = 1;
-	};
-	
-	X_NET_JSONP_NinjaIframe
-		[ 'refresh' ]( html.join( '' ) )
-		[ 'listen' ]( [ X_EVENT_SUCCESS, X_EVENT_ERROR ], X_NET_JSONPWrapper, X_NET_JSONP_iframeListener );
+				if( X_UA[ 'Opera' ] ){
+					html = [
+						( window[ 'JSON' ] ? '' : '<script src="' + json2Path + '"></script>' ),
+						'<script>',
+							'onunload=function(){im.onload=im.onerror=""};',
+							'nw=+new Date;',
+							'function cb(o){if(nw){nw-=+new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw', window[ 'JSON' ] ? json2FileSize : 0 ,');nw=0}}',
+						'</script>',	
+						'<script id="jp"></script>',
+						'<img id="im" src="', url, '" onload="jp.src=im.src" onerror="jp.src=im.src">'
+					];
+					X_Net_JSONP_maxOnloadCount = 2;
+				} else
+				if( X_UA[ 'IE8' ] ){
+					html = [
+						// JavaScriptでunicode文字列をunescapeする
+						// http://perutago.seesaa.net/article/202801583.html
+						
+						// http://blog.livedoor.jp/dankogai/archives/51503830.html		
+						// Ajax - IE8にもJSON入ってます。使えるとは限らないけど
+						// Compatibility mode (別名Quirks mode) では、JSONオブジェクトは無効になります。iframeもだめです
+						'<script id="jp"></script>',
+						'<script>',
+							'onunload=function(){clearTimeout(id)};',
+							'nw=0;', // なぜか必要,,,
+							'function cb(o){nw-=+new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',parent.JSON.stringify(o).replace(/\\\\u([a-fA-F0-9]{4})/g,function(a,b){return String.fromCharCode(parseInt(b,16))}),-nw)}',
+							//'function cb(o){if(nw){nw-=+new Date;postMessage("', X_NET_JSONP_SEND_MSG_KEY,' "+nw+"|"+parent.JSON.stringify(o).replace(/\\\\u([a-fA-F0-9]{4})/g,function(a,b){return String.fromCharCode(parseInt(b,16))}),"*");nw=0}}',			
+							'function tm(){jp.src="', url ,'";nw=+new Date}',
+							'id=setTimeout(tm,16);',
+						'</script>'
+						
+						/*　以下のコードは XP ie8 では動くけど、win8 IE11(8モード)で動かない 開発の便宜を取って,setTimeout を挟む
+						'<script>',
+							'function cb(o){window.parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',window.parent.JSON.stringify(o))}',
+						'</script>',
+						'<script src="', url, '"></script>' */
+					];
+					X_Net_JSONP_maxOnloadCount = 2;
+				} else
+				if( X_UA[ 'IE9' ] ){
+					html = [
+						'<script id="jp"></script>',
+						'<script>',
+							'onunload=function(){clearTimeout(id)};',
+							'function cb(o){nw-=+new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw)}',
+							'function tm(){jp.src="', url ,'";nw=+new Date}',
+							'id=setTimeout(tm,16);',
+						'</script>'
+					];
+					X_Net_JSONP_maxOnloadCount = 2;
+				} else
+				if( window[ 'JSON' ] ){
+					html = [	
+						'<script>',
+							'nw=+new Date;',
+							'function cb(o){if(nw){nw-=+new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw);nw=0}}',
+							//'function cb(o){if(nw){nw-=+new Date;parent.postMessage("', X_NET_JSONP_SEND_MSG_KEY,' "+nw+"|"+JSON.stringify(o),"', location.origin, '");nw=0}}',
+						'</script>',
+						'<script src="', url, '"></script>'
+					];
+					X_Net_JSONP_maxOnloadCount = 1;
+				} else
+				if( X_UA[ 'IE4' ] || X_UA[ 'MacIE' ] ){
+					html = [
+						'<script id="jn"></script>',
+						'<script id="jp"></script>',
+						'<script>',
+							'onunload=function(){clearTimeout(id)};',
+							'function cb(o){nw-=new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw-16,', json2FileSize, ')}',
+							'function t1(){document.all.jn.src="', json2Path ,'";id=setTimeout("t2()",16);nw=+new Date}',
+							'id=setTimeout("t1()",16);',
+							'function t2(){if(window.JSON){document.all.jp.src="', url ,'"}else{id=setTimeout("t2()",16)}}',
+						'</script>'
+					];
+					X_Net_JSONP_maxOnloadCount = 3;
+				} else
+				if( X_UA[ 'IE' ] < 8 ){ // ie5-7
+					html = [
+						'<script id="jn"></script>',
+						'<script id="jp"></script>',
+						'<script>',
+							'onunload=function(){clearTimeout(id)};',
+							'function cb(o){nw-=new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw-16,', json2FileSize, ')}',
+							'function t1(){jn.src="', json2Path ,'";id=setTimeout(t2,16);nw=+new Date}',
+							'id=setTimeout(t1,16);',
+							'function t2(){if(window.JSON){jp.src="', url ,'"}else{id=setTimeout(t2,16)}}',
+						'</script>'
+					];
+					X_Net_JSONP_maxOnloadCount = 3;
+				} else {
+					html = [
+						'<script>',
+							'function cb(o){if(nw){nw-=new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw,', json2FileSize, ');nw=0}}',
+							'nw=+new Date;',
+						'</script>',
+						'<script src="', json2Path, '"></script>',
+						'<script src="', url, '"></script>'
+					];
+					X_Net_JSONP_maxOnloadCount = 2;
+				};
+				
+				X_NET_JSONPWrapper
+					[ 'refresh' ]( html.join( '' ) )
+					[ 'listen' ]( [ 'ninjaload', 'ninjaerror' ], X_NET_JSONP_iframeListener );
+							
+				X_NET_JSONPWrapper._busy = true;
+			},
+			
+			cancel : function(){
+				X_NET_JSONPWrapper.reset();
+				X_NET_JSONPWrapper._canceled = true;
+			},
+			
+			reset : function(){
+				X_NET_JSONPWrapper._busy = X_NET_JSONPWrapper._canceled = false;
+				X_Net_JSONP_onloadCount = 0;
+				X_NET_JSONPWrapper[ 'unlisten' ]( [ 'ninjaload', 'ninjaerror' ], X_NET_JSONP_iframeListener );
+				X_NET_JSONPWrapper[ 'refresh' ]( '' );
+				X_Net_JSONP_errorTimerID && X_Timer_remove( X_Net_JSONP_errorTimerID );
+			}
+		}
+	);
 };
 
-
 function X_NET_JSONP_iframeListener( e ){
 	switch( e.type ){
-		case X_EVENT_SUCCESS :
-			console.log( 'iframe onload, but ' + X_NET_JSONPWrapper._onloadCount + ' < ' + X_Net_JSONP_onloadCount );
-			if( ++X_NET_JSONPWrapper._onloadCount < X_Net_JSONP_onloadCount ) return;
-			// TODO callback が無ければ error
-			X_NET_JSONPWrapper[ 'asyncDispatch' ]( 1000, X_EVENT_ERROR );
+		case 'ninjaload' :
+			console.log( 'iframe onload, but ' + X_Net_JSONP_onloadCount + ' < ' + X_Net_JSONP_maxOnloadCount );
+			if( ++X_Net_JSONP_onloadCount < X_Net_JSONP_maxOnloadCount ) return;
+			
+			// TODO callback が無ければ error -> timeout を観る?
+			X_Net_JSONP_errorTimerID = X_NET_JSONPWrapper[ 'asyncDispatch' ]( 1000, X_EVENT_ERROR );
 			break;
-		case X_EVENT_ERROR :
+		case 'ninjaerror' :
 			console.log( 'iframe onerror' );
 			X_NET_JSONPWrapper[ 'asyncDispatch' ]( X_EVENT_ERROR );
 			break;
 	};
-	X_EventDispatcher_unlistenAll( X_NET_JSONP_NinjaIframe );
 	return X_Callback_UN_LISTEN;
 };
-
-// TODO extend NinjaIframe
-X_NET_JSONPWrapper = X_Class_override(
-	X_EventDispatcher(),
-	{
-
-		_busy         : false,
-		_canceled     : false,
-		_onloadCount  : 0,
-		
-		load : function( url, data, timeout ){
-			//createURL
-			X_NET_JSONP_loadScriptInNinjaIframe( url );
-						
-			this._busy = true;
-		},
-		
-		cancel : function(){
-			this._canceled = true;
-		},
-		
-		reset : function(){
-			this._busy = this._canceled = false;
-			this._onloadCount = 0;
-		}
-	}
-);
diff --git a/0.6.x/js/06_net/04_XNetImage.js b/0.6.x/js/06_net/04_XNetImage.js
index 9f5be7a..7ec0e7d 100644
--- a/0.6.x/js/06_net/04_XNetImage.js
+++ b/0.6.x/js/06_net/04_XNetImage.js
@@ -26,6 +26,11 @@ if( X_Net_Image_isElement ){
  * 
  * Opera7 では毎回 image を作る必要あり、src が異なればOK?
  */
+
+X_TEMP.X_NET_Image_init = function(){
+
+delete X_TEMP.X_NET_Image_init;
+
 X_NET_ImageWrapper = X_Class_override(
 	!X_Net_Image_isElement ? X_EventDispatcher( X_Net_Image_image ) : Node( X_Net_Image_image ),
 	{
@@ -40,71 +45,16 @@ X_NET_ImageWrapper = X_Class_override(
 		
 		load : function( data ){
 			this._busy   = true;
-			this.abspath = X.URL.toAbsolutePath( data.url );
-			this.delay   = data.delay || 100;
-			this.timeout = data.timeout || 5000;
+			this.abspath = X_URL_toAbsolutePath( data[ 'url' ] );
+			this.delay   = data[ 'delay'   ] || 100;
+			this.timeout = data[ 'timeout' ] || 5000;
 
 			this[ '_rawObject' ].src = this.abspath;
 
 			if( X_UA[ 'Opera7' ] && this[ '_rawObject' ].complete ){
 				this[ 'asyncDispatch' ]( 'load' );
 			} else {
-				this.timerID = X_Timer_add( this.delay, 0, this, this._detect );
-			};
-		},
-		
-		handleEvent : function( e ){
-			var size;
-			switch( e.type ){
-				case 'error' :
-				//case 'abort' : // TODO ??
-					if( this.finish ) return;
-					this._busy  = false;
-					this.finish  = true;
-					this.timerID && X_Timer_remove( this.timerID );
-					this.timerID = this[ 'asyncDispatch' ]( /*e.type === 'error' ?*/ X_EVENT_ERROR /*: X_EVENT_CANCELED*/ );
-					break;
-				case 'load' :
-				// if( finish === true ) return; // これがあると firefox3.6 で駄目、、、
-				// if( timer ) return; // これがあると safari3.2 で駄目、、、
-					this._busy  = false;
-					this.finish = true;
-					this.timerID && X_Timer_remove( this.timerID );
-					if( X_UA[ 'Opera' ] && !this[ '_rawObject' ].complete ){
-						this.timerID = this[ 'asyncDispatch' ]( X_EVENT_ERROR );
-						return;
-					};
-					size = X.Util.Image.getActualDimension( !X_Net_Image_isElement ? this.abspath : this );
-					this.timerID = this[ 'asyncDispatch' ]( {
-						type : X_EVENT_SUCCESS,
-						src  : this.abspath,
-						w    : size[ 0 ],
-						h    : size[ 1 ]
-						// TODO feedback net speed
-						// time , this[ '_rawObject' ].fileSize
-					} );
-					break;
-				case X_EVENT_KILL_INSTANCE :
-					this.reset();
-					!X_Net_Image_hasImage && this[ 'kill' ](); // if xnode
-					break;
-			};
-		},
-		
-		_detect : function(){
-			if( this.finish ) return;
-			if( this[ '_rawObject' ] && this[ '_rawObject' ].complete ){
-				this._busy  = false;
-				this.finish = true;
-				if( this[ '_rawObject' ].width ) return;
-				X_Timer_remove( this.timerID );
-				this.timerID = this[ 'asyncDispatch' ]( X_EVENT_ERROR );
-			} else
-			if( this.timeout < ( this.tick += this.delay ) ){
-				this._busy  = false;
-				this.finish = true;
-				X_Timer_remove( this.timerID );
-				this.timerID = this[ 'asyncDispatch' ]( X_EVENT_TIMEOUT );
+				this.timerID = X_Timer_add( this.delay, 0, this, X_NET_Image_detect );
 			};
 		},
 		
@@ -114,7 +64,6 @@ X_NET_ImageWrapper = X_Class_override(
 			// this[ '_rawObject' ].src = '';
 			this._busy  = false;
 			this.finish = true;
-			this[ 'asyncDispatch' ]( X_EVENT_CANCELED );
 		},
 		
 		reset : function(){
@@ -129,6 +78,70 @@ X_NET_ImageWrapper = X_Class_override(
 	}
 );
 
-X_NET_ImageWrapper[ 'listen' ]( [ 'load', 'error' /*, 'abort'*/, X_EVENT_KILL_INSTANCE ] );
+X_NET_ImageWrapper[ 'listen' ]( [ 'load', 'error' /*, 'abort'*/, X_EVENT_KILL_INSTANCE ], X_NET_Image_handleEvent );
+
+return X_NET_ImageWrapper;
+
+};
+
+function X_NET_Image_detect(){
+	if( this.finish ) return;
+	if( this[ '_rawObject' ] && this[ '_rawObject' ].complete ){
+		this._busy  = false;
+		this.finish = true;
+		if( this[ '_rawObject' ].width ) return;
+		X_Timer_remove( this.timerID );
+		this.timerID = this[ 'asyncDispatch' ]( X_EVENT_ERROR );
+	} else
+	if( this.timeout < ( this.tick += this.delay ) ){
+		this._busy  = false;
+		this.finish = true;
+		X_Timer_remove( this.timerID );
+		this.timerID = this[ 'asyncDispatch' ]( X_EVENT_TIMEOUT );
+	};
+};
+
+function X_NET_Image_handleEvent( e ){
+	var size;
+	
+	switch( e.type ){
+		case 'error' :
+		//case 'abort' : // TODO ??
+			if( this.finish ) return;
+			this._busy  = false;
+			this.finish  = true;
+			this.timerID && X_Timer_remove( this.timerID );
+			this.timerID = this[ 'asyncDispatch' ]( /*e.type === 'error' ?*/ X_EVENT_ERROR /*: X_EVENT_CANCELED*/ );
+			break;
+
+		case 'load' :
+		// if( finish === true ) return; // これがあると firefox3.6 で駄目、、、
+		// if( timer ) return; // これがあると safari3.2 で駄目、、、
+			this._busy  = false;
+			this.finish = true;
+			this.timerID && X_Timer_remove( this.timerID );
+			if( X_UA[ 'Opera' ] && !this[ '_rawObject' ].complete ){
+				this.timerID = this[ 'asyncDispatch' ]( X_EVENT_ERROR );
+				return;
+			};
+
+			size = X_Util_Image_getActualDimension( !X_Net_Image_isElement ? this.abspath : this );
+			this.timerID = this[ 'asyncDispatch' ]( {
+				type : X_EVENT_SUCCESS,
+				src  : this.abspath,
+				w    : size[ 0 ],
+				h    : size[ 1 ]
+				// TODO feedback net speed
+				// time , this[ '_rawObject' ].fileSize
+			} );
+			break;
+
+		case X_EVENT_KILL_INSTANCE :
+			this.reset();
+			!X_Net_Image_hasImage && this[ 'kill' ](); // if xnode
+			break;
+	};
+};
+
 
 // X_Net_Image_isElement && X_NET_ImageWrapper[ 'appendAt' ]( X.X_Node_systemNode );
diff --git a/0.6.x/js/07_audio/01_XWebAudio.js b/0.6.x/js/07_audio/01_XWebAudio.js
index 8a5e1ed..958b441 100644
--- a/0.6.x/js/07_audio/01_XWebAudio.js
+++ b/0.6.x/js/07_audio/01_XWebAudio.js
@@ -69,7 +69,7 @@ if( X_Audio_WebAudio_context ){
 					// TODO 当てにしていたaudioがclose 等した場合
 					audio.proxy[ 'listenOnce' ]( 'canplaythrough', this, this._onBufferReady );
 				} else {
-					this.xhr = X.Net.xhrGet( url, { type : 'arraybuffer' } )
+					this.xhr = X.Net( { 'xhr' : url, 'type' : 'arraybuffer' } )
 									[ 'listen' ]( X_EVENT_PROGRESS, this )
 									[ 'listenOnce' ]( [ X_EVENT_SUCCESS, X_EVENT_COMPLETE, X_EVENT_CANCELED ], this );					
 				};
diff --git a/0.6.x/js/20_ui/05_XUI_Gesture.js b/0.6.x/js/20_ui/05_XUI_Gesture.js
index 355fbaf..bcf156f 100644
--- a/0.6.x/js/20_ui/05_XUI_Gesture.js
+++ b/0.6.x/js/20_ui/05_XUI_Gesture.js
@@ -79,34 +79,17 @@
 		// and we are now handling a mouse event, we stop that to prevent conflicts
 		if( enable_detect ){
 			// update pointerevent
-			if( Hammer.HAS_POINTEREVENTS ){ //eventType !== Hammer.EVENT_END ){
-				console.log( 'e.pointerId = ' + e.pointerId );
-				POINTERS[ e.identifier = e.pointerId ] = type & END ? null : e;
-				touches = [];
-				numTouches = -1;
-				// we can use forEach since pointerEvents only is in IE10
-				for( i = 0, l = POINTERS.length; i < l; ++i ){
-					POINTERS[ i ] && ( touches[ ++numTouches ] = POINTERS[ i ] );
-				};
-				numTouches = touches.length;
-				
-				///console.log( 'numTouches ' + numTouches );
-			} else
-			// touch
-			if ( type & TOUCH ){ //sourceEventType.match(/touch/)) {
-				touches    = Hammer.DO_TOUCHES_FIX && type & END ? [] : e.touches;
-				numTouches = touches.length;
-			} else
-			// mouse
-			if( !touch_triggered ){
-				numTouches = ( type & END ) ? 0 : 1;
-				touches    = numTouches === 0 ? [] : [{
-					identifier : 1,
-					pageX      : e.pageX,
-					pageY      : e.pageY,
-					target     : e.target
-				}];
+
+			POINTERS[ e.pointerId ] = type & END ? null : e;
+			touches    = [];
+			numTouches = -1;
+			// we can use forEach since pointerEvents only is in IE10
+			for( i in POINTERS ){
+				POINTERS[ i ] && ( touches[ ++numTouches ] = POINTERS[ i ] );
 			};
+			++numTouches;
+			///console.log( 'numTouches ' + numTouches );
+
 			// if we are in a end event, but when we remove one touch and
 			// we still have enough, set eventType to move
 			if( 0 < numTouches && type & END ){ // eventType === Hammer.EVENT_END ){
diff --git a/0.6.x/js/import.js b/0.6.x/js/import.js
index 4b34d64..e260590 100644
--- a/0.6.x/js/import.js
+++ b/0.6.x/js/import.js
@@ -14,7 +14,8 @@ document.write( [
 		'js/01_core/04_XObject.js',
 		'js/01_core/05_XString.js',
 		'js/01_core/06_XURL.js',
-						
+
+		'js/01_core/09_XPair.js',						
 		'js/01_core/10_XCallback.js',
 		'js/01_core/11_XClass.js',
 		'js/01_core/12_XEvent.js',