From dc5a75639232882249108b4f708916e9690e42b3 Mon Sep 17 00:00:00 2001
From: itozyun <itozyun@user.sourceforge.jp>
Date: Fri, 16 Jan 2015 21:41:11 +0900
Subject: [PATCH] Version 0.6.121, iScroll5 is working on iPhone touch 1G,
 update X.Audio.

---
 0.6.x/js/01_core/02_XUA.js                |   6 +-
 0.6.x/js/01_core/04_XObject.js            |  14 +-
 0.6.x/js/01_core/06_XURL.js               |  15 +-
 0.6.x/js/01_core/12_XEvent.js             |  24 ++-
 0.6.x/js/01_core/13_XEventDispatcher.js   |  19 ++-
 0.6.x/js/01_core/14_XTimer.js             |   8 +-
 0.6.x/js/01_core/16_XViewPort.js          |   4 +-
 0.6.x/js/02_dom/02_XNode.js               | 101 ++++++++-----
 0.6.x/js/02_dom/03_XDomEvent.js           |   8 -
 0.6.x/js/02_dom/04_XBoxModel.js           |  27 ++--
 0.6.x/js/02_dom/05_XNodeAttr.js           |  38 +++--
 0.6.x/js/02_dom/06_XNodeCSS.js            |  14 +-
 0.6.x/js/02_dom/07_XNodeList.js           |   4 +-
 0.6.x/js/02_dom/10_XNodeAnime.js          | 177 +++++++++++++++-------
 0.6.x/js/05_util/01_XNinjaIframe.js       |   2 +-
 0.6.x/js/06_net/00_XNet.js                |   3 +
 0.6.x/js/06_net/01_XNetXHR.js             |   1 +
 0.6.x/js/07_audio/00_XAudio.js            | 186 +++++++++++++----------
 0.6.x/js/07_audio/01_XWebAudio.js         |  30 ++--
 0.6.x/js/07_audio/02_XHTMLAudio.js        | 244 +++++++++++++++++++-----------
 0.6.x/js/07_audio/03_XSilverlightAudio.js |  70 +++++----
 0.6.x/js/07_audio/10_XAudioSprite.js      |  81 +++++-----
 0.6.x/js/20_ui/02_XUI_Attr.js             |   3 +
 0.6.x/js/20_ui/04_XUI_Event.js            |   1 +
 0.6.x/js/20_ui/06_AbstractUINode.js       |   1 +
 0.6.x/js/20_ui/08_Box.js                  |   1 +
 0.6.x/js/20_ui/15_ScrollBox.js            |   2 +-
 27 files changed, 675 insertions(+), 409 deletions(-)

diff --git a/0.6.x/js/01_core/02_XUA.js b/0.6.x/js/01_core/02_XUA.js
index 0f0209e..c0a1d4f 100644
--- a/0.6.x/js/01_core/02_XUA.js
+++ b/0.6.x/js/01_core/02_XUA.js
@@ -82,7 +82,7 @@ var X_UA = (function( n, undefined ){
 				acme[ sys] = true;
 		};
 	} else
-	if( sys.indexOf( 'Linux' ) + 1 ){
+	if( ( sys.indexOf( 'Linux' ) + 1 ) || ( sys.indexOf( 'Android' ) + 1 ) ){
 		console.log( 'Linux' );
 		acme.Linux = true;
 		
@@ -142,7 +142,7 @@ Sleipnir Mobile 	Android 2.1以上 	Fenrir
 		acme.IE9      = 9 <= acme.IE && acme.IE < 10;
 		acme.MacIE    = acme.Mac;
 		acme.IEMobile = dua.toLowerCase().indexOf( 'iemobile' ) !== -1 || acme.WinCE;
-		acme.WinPhone = dua.toLowerCase().indexOf( 'windows phone' ) !== -1;
+		acme.WinPhone = dua.toLowerCase().indexOf( 'windows phone' ) !== -1 || 0 < dav.indexOf( 'ZuneWP' ); // ZuneWP は　IEM のデスクトップモードで使用
 		console.log( '>> IE : ' + acme.IE + ' ActiveX : ' + acme.ActiveX );
 		// TODO XBox360, XBox1, Modern or Desktop, Standalone
 		return acme;
@@ -164,6 +164,8 @@ Sleipnir Mobile 	Android 2.1以上 	Fenrir
 	// http://www.useragentstring.com/pages/Playstation%203/
 	// Mozilla/5.0 (PLAYSTATION 3; 3.55)
     // Mozilla/4.0 (PS3 (PlayStation 3); 1.00)
+    // https://github.com/Famous/famous/blob/1a02c8084587d80519ea4bd3b55649ab32ee2e65/examples/assets/lib/require.js
+    // PS3 ブラウザのロードイベントについて
 	if( ( i = dua.toUpperCase().indexOf( 'PLAYSTATION 3' ) !== -1 ) ){
 		acme.PS3 = parseFloat( dua.substr( i + 15 ) ) || 0.1;
 		console.log( '>> PS3 : ' + acme.PS3 );
diff --git a/0.6.x/js/01_core/04_XObject.js b/0.6.x/js/01_core/04_XObject.js
index be7f595..e9d96df 100644
--- a/0.6.x/js/01_core/04_XObject.js
+++ b/0.6.x/js/01_core/04_XObject.js
@@ -31,6 +31,7 @@ function X_Object_clone( src ){
 	if( typeof src !== 'object' ) return src;
 	ret = {};
 	for( k in src ){
+		//if( X_EMPTY_OBJECT[ k ] ) continue;
 		ret[ k ] = src[ k ];
 	};
 	return ret;
@@ -40,6 +41,7 @@ function X_Object_override( target, src ){
 	var k;
 	if( !X.Type.isObject( src ) ) return target;
 	for( k in src ){
+		//if( X_EMPTY_OBJECT[ k ] ) continue;
 		target[ k ] = src[ k ];
 	};
 	return target;
@@ -50,7 +52,7 @@ function X_Object_deepCopy( src ){
 };
 
 function X_Object_deepCopy_( src, objSrc, objCopy, n ) {
-	var ret, i, key;
+	var ret, i, k;
 	if( !src ){ // 0, "", null, undefined, NaN, false
 		return src;
 	} else
@@ -69,8 +71,9 @@ function X_Object_deepCopy_( src, objSrc, objCopy, n ) {
 		// string, number, true
 		return src;
 	};
-	for( key in src ){
-		ret[ key ] = clone( src[ key ], objSrc, objCopy, n );
+	for( k in src ){
+		//if( X_EMPTY_OBJECT[ k ] ) continue;
+		ret[ k ] = clone( src[ k ], objSrc, objCopy, n );
 	};
 	return ret;
 };
@@ -86,8 +89,9 @@ function X_Object_cloneArray( ary ){
 };
 	
 function X_Object_isEmpty( v ){
-	var p;
-	for( p in v ){
+	var k;
+	for( k in v ){
+		//if( X_EMPTY_OBJECT[ k ] ) continue;
 		return false;//if( v.hasOwnProperty && v.hasOwnProperty( p ) ) return false; ie4 で動かない、、、
 	};
 	return true;
diff --git a/0.6.x/js/01_core/06_XURL.js b/0.6.x/js/01_core/06_XURL.js
index 7a23619..8bd31bc 100644
--- a/0.6.x/js/01_core/06_XURL.js
+++ b/0.6.x/js/01_core/06_XURL.js
@@ -34,13 +34,9 @@ var X_URL_BASE_URL = ( function( parts ){
 				obj[ decodeURIComponent( pair.substr( 0, p ) ) ] = X_String_parse( decodeURIComponent( pair.substr( p + 1 ) ) );
 			};
 		};
-/*
-		for( p in obj ){
-			console.log( p + ' = ' + obj[ p ] );
-		}; */
 
 		return obj;
-	})( location.search );
+	} )( location.search );
 
 // ------------------------------------------------------------------------- //
 // --- interface ----------------------------------------------------------- //
@@ -59,7 +55,9 @@ X.URL = {
 	
 	isSameDomain   : X_URL_isSameDomain,
 	
-	cleanup        : X_URL_cleanup
+	cleanup        : X_URL_cleanup,
+	
+	getEXT         : X_URL_getEXT
 };
 
 // ------------------------------------------------------------------------- //
@@ -103,3 +101,8 @@ function X_URL_cleanup( path ){
 	return path.split( '?' )[ 0 ].split( '#' )[ 0 ];
 };
 
+function X_URL_getEXT( path ){
+	path = X_URL_cleanup( path ).split( '.' );
+	return path.length ? path.pop() : '';
+};
+
diff --git a/0.6.x/js/01_core/12_XEvent.js b/0.6.x/js/01_core/12_XEvent.js
index 1bcb3f9..6c2a208 100644
--- a/0.6.x/js/01_core/12_XEvent.js
+++ b/0.6.x/js/01_core/12_XEvent.js
@@ -90,17 +90,35 @@ X.Event = {
 	UNLOAD                 : 26,
 	
 	BACKEND_READY          : 27,
-	BACKEND_NOT_FOUND      : 28,
+	BACKEND_NONE           : 28,
 	BACKEND_RESEARCH       : 29,
-	BACKEND_CHANGED        : 30
+	BACKEND_CHANGED        : 30,
+	
+	ANIME_BEFORE_START     : 31,
+	ANIME_START            : 32,
+	ANIME                  : 33,
+	ANIME_END              : 34,
+	ANIME_BEFORE_STOP      : 35, // xnode.stop() のみ、指定時間による停止では呼ばれない
+	ANIME_STOP             : 36,
+	
+	GPU_RELEASED           : 37,
+
+	MEDIA_PLAYING          : 38,
+	MEDIA_BEFORE_LOOP      : 39, // cancelable
+	MEDIA_LOOPED           : 40,
+	MEDIA_PAUSED           : 41,
+	MEDIA_ENDED            : 42,
+	MEDIA_WAITING          : 43,
+	MEDIA_SEEKING          : 44
 };
 
-X_Event_last = 30;
+X_Event_last = 44;
 
 X_TEMP.onSystemReady.push(
 	function(){
 		var k, name, i;
 		for( k in X_Event_Rename ){
+			//if( X_EMPTY_OBJECT[ k ] ) continue;
 			name = X_Event_Rename[ k ];
 			if( X.Type.isArray( name ) ){
 				for( i = name.length; i; ){
diff --git a/0.6.x/js/01_core/13_XEventDispatcher.js b/0.6.x/js/01_core/13_XEventDispatcher.js
index b3763fc..25c2d11 100644
--- a/0.6.x/js/01_core/13_XEventDispatcher.js
+++ b/0.6.x/js/01_core/13_XEventDispatcher.js
@@ -120,6 +120,14 @@ X.EventDispatcher =
 		 * @type {boolean}
 		 */
 			'_killReserved' : false,
+
+		/**
+		 * asyncDispatch 中に kill が呼ばれた場合に、X.EventDispatcher インスタンスの削除を最後のタイマーの発火後にずらすために立てるフラグ。
+		 * TODO asyncDispatch の解除はどうする?
+		 * @private
+		 * @type {boolean}
+		 */
+			'_lastLazyID' : false,
 			
 	    /**
 	     * X.EventDispatcher のコンストラクタの実体。
@@ -229,7 +237,7 @@ X.EventDispatcher =
 					e = delay;
 					delay = 0;
 				};
-				return X.Timer.add( delay, 1, this, this.dispatch, [ e ] );
+				return this[ '_lastLazyID' ] = X.Timer.add( delay, 1, this, X_EventDispatcher_dispatch, [ e ] );
 			}
 		}
 	);
@@ -297,6 +305,11 @@ function X_EventDispatcher_dispatch( e ){
 	};
 	
 	if( ( --this._dispatching ) === 0 ){
+		
+		if( this[ '_lastLazyID' ] && X_Timer_currentUID === this[ '_lastLazyID' ] ){
+			delete this[ '_lastLazyID' ];
+		};
+		
 		// dispatch 中に unlisten された要素の削除
 		unlistens = this._unlistens;
 		delete this._dispatching;
@@ -304,6 +317,7 @@ function X_EventDispatcher_dispatch( e ){
 		// _unlistens に入っている callbackHash は、lock をクリアしている
 		X_EventDispatcher_unlock = true;
 		for( type in unlistens ){
+			//if( X_EMPTY_OBJECT[ type ] ) continue;
 			list = unlistens[ type ];
 			for( i = list.length; i; ){
 				this.unlisten( type, list[ --i ] );
@@ -419,6 +433,7 @@ function X_EventDispatcher_unlisten( opt_type, opt_arg1, opt_arg2, opt_arg3 ){
 	if( opt_type === undefined ){
 		// 全て削除
 		for( opt_type in list ){
+			//if( X_EMPTY_OBJECT[ opt_type ] ) continue;
 			_list = list[ opt_type ];
 			for( i = _list.length; i; ){
 				this.unlisten( opt_type, _list[ --i ] ); // override されていることがあるので、必ず unlisten を使用
@@ -521,7 +536,6 @@ var X_EventDispatcher_actualAddEvent =
 			} else {
 				console.log( 'event > ' + type );
 				that._handleEvent || ( that._handleEvent = X_Callback_create( that, X_EventDispatcher_actualHandleEvent ) );
-				
 
 				if( raw.addEventListener ){
 					raw.addEventListener( type, that._handleEvent, false );
@@ -754,6 +768,7 @@ function X_EventDispatcher_toggleAllEvents( that, add ){
 		type;
 	if( !list || !raw ) return;
 	for( type in list ){
+		//if( X_EMPTY_OBJECT[ type ] ) continue;
 		// 数字イベントの除外
 		if( '' + parseFloat( type ) !== type ){
 			// TODO type rename はここ
diff --git a/0.6.x/js/01_core/14_XTimer.js b/0.6.x/js/01_core/14_XTimer.js
index 88c6a84..9dbfe40 100644
--- a/0.6.x/js/01_core/14_XTimer.js
+++ b/0.6.x/js/01_core/14_XTimer.js
@@ -67,6 +67,7 @@ var X_Timer_now = Date.now || function(){ return +new Date; },
 	X_Timer_busyTimeout    = false,
 	X_Timer_timeStamp      = 0, // setTimeout に登録した時間
 	X_Timer_waitTime       = 0,	// 待ち時間
+	X_Timer_currentUID     = 0, // 現在発火中の uid
 	
 	X_Timer_REQ_FRAME_LIST = [],
 	X_Timer_requestID      = 0,
@@ -228,8 +229,9 @@ function X_Timer_onTimeout(){
 		};
 		c = q.count;
 		
+		X_Timer_currentUID = q.uid;
+		
 		if( q.k ){
-			//q.a = [];
 			r = X_Callback_proxyCallback( q, [] );
 		} else {
 			r = q.f();
@@ -252,12 +254,13 @@ function X_Timer_onTimeout(){
 		if( 1 < c ) --q.count;
 		q.last = q.time;
     };
-    X_Timer_timerId     = 0;
+    X_Timer_timerId     = X_Timer_currentUID = 0;
     X_Timer_busyTimeout = false;
     
     if( X_Timer_removal ){
     	X_Timer_skipUpdate = true;
     	for( uid in X_Timer_removal ){
+    		//if( X_EMPTY_OBJECT[ uid ] ) continue;
     		X.Timer.remove( uid );
     	};
     	X_Timer_skipUpdate = false;
@@ -344,6 +347,7 @@ function X_Timer_onEnterFrame( time ){
     X_Timer_busyOnFrame = false;
     if( X_Timer_removal ){
     	for( uid in X_Timer_removal ){
+    		//if( X_EMPTY_OBJECT[ uid ] ) continue;
     		X.Timer.cancelFrame( X_Timer_removal[ uid ] );
     	};
     	X_Timer_removal = null;
diff --git a/0.6.x/js/01_core/16_XViewPort.js b/0.6.x/js/01_core/16_XViewPort.js
index 8b079cc..5627a85 100644
--- a/0.6.x/js/01_core/16_XViewPort.js
+++ b/0.6.x/js/01_core/16_XViewPort.js
@@ -64,7 +64,7 @@ X_ViewPort = X_Class_override(
 				case 'focus' :
 					if( !X_ViewPort_active ){
 						X_ViewPort_active = true;
-						X_ViewPort.dispatch( X.Event.VIEW_ACTIVATE );						
+						X_ViewPort.dispatch( X.Event.VIEW_ACTIVATE );
 					};
 					break;
 
@@ -72,7 +72,7 @@ X_ViewPort = X_Class_override(
 				case 'blur' :
 					if( X_ViewPort_active ){
 						X_ViewPort_active = false;
-						X_ViewPort.dispatch( X.Event.VIEW_DEACTIVATE );						
+						X_ViewPort.dispatch( X.Event.VIEW_DEACTIVATE );				
 					};
 					break;
 			};
diff --git a/0.6.x/js/02_dom/02_XNode.js b/0.6.x/js/02_dom/02_XNode.js
index 9c44e1d..b7bbf6f 100644
--- a/0.6.x/js/02_dom/02_XNode.js
+++ b/0.6.x/js/02_dom/02_XNode.js
@@ -172,6 +172,11 @@ var
 			X_Node_CHASHE[ this._uid = uid ] = this;
 		},
 		
+		// attr
+		// css, cssText
+		// find
+		// animate, stop
+		
 		create         : X_Node_create,
 		
 		createAt       : X_Node_createAt,
@@ -654,7 +659,7 @@ function X_Node_destroy( isChild ){
  */
 function X_Node_contains( v ){
 	var elm, type, xnodes, i;
-	if( !v || this._xnodeType !== 1 ) return false;
+	if( !v || this._xnodeType !== 1 || this === v ) return false;
 	// contains ie4+
 	if( ( elm = this._rawObject || X_UA_DOM.IE4 && X_Node__ie4getRawNode( this ) ) && document.contains && ( type = X_Node_getType( v ) ) && ( type === X_Node_TYPE.RAW_HTML || type === X_Node_TYPE.RAW_TEXT ) ){
 		return elm.contains( v );	
@@ -665,7 +670,7 @@ function X_Node_contains( v ){
 	xnodes = this._xnodes;
 	if( !xnodes || !xnodes.length ) return false;
 	if( xnodes.indexOf( v ) !== -1 ) return true; // fast
-	if( elm === v.parentNode ) return false;
+	if( elm === v.parentNode ) return true;
 	for( i = xnodes.length; i; ){
 		if( xnodes[ --i ].contains( v ) ) return true;
 	};
@@ -794,8 +799,9 @@ function X_Node_hasClass( v ){
 
 /* --------------------------------------
  *  html, text
+ * 
+ * outerHTML が欲しい場合は、xnode.attr('outerHTML') とできる。
  */
-
 function X_Node_html( html ){
 	var _ = '', q = '"', xnodes, n, i, l;
 	// setter
@@ -1114,20 +1120,6 @@ var X_Node__updateRawNode =
 				};
 			};
 			
-			// style
-			// TODO display:none の場合、更新をスキップ
-			if( that._dirty & X_Node_Dirty.CSS ){
-				if( that._cssText !== null || ( that._cssText = X_Node_CSS_objToCssText( that ) ) ){
-					X_UA.Opera78 || X_UA.NN6 ?
-						elm.setAttribute( 'style', that._cssText ) : // opera8用
-						( elm.style.cssText = that._cssText );
-				} else {
-					elm.style.cssText = ''; // IE5.5以下 Safari3.2 で必要
-					elm.removeAttribute( 'style' );
-					delete that._cssText;
-				};
-			};
-			
 			if( that._dirty & X_Node_Dirty.IE_FILTER ){
 				elm.style.filter = X_Node_CSS_objToIEFilterText( that );;
 			};
@@ -1136,24 +1128,45 @@ var X_Node__updateRawNode =
 			// TODO display:none の場合、更新をスキップ
 			if( that._dirty & X_Node_Dirty.ATTR && ( attrs = that._newAttrs || that._attrs ) ){
 				rename = X_Node_Attr_renameForDOM;
+				
+				// IETester 5.5 ではエラーが出なかった．MultipulIE5.5 ではエラーが出たので
+				if( !X_UA.MacIE && X_UA.IE5x && that._tag === 'TEXTAREA' && ( ( v = attrs[ 'value' ] ) || X_Object_inObject( 'value', attrs ) ) ){
+					delete attrs[ 'value' ];
+					elm.firstChild ?
+						( elm.firstChild.data = v || '' ) :
+						elm.appendChild( document.createTextNode( v || '' ) );
+				};
+				// http://outcloud.blogspot.jp/2010/09/iframe.html
+				// この問題は firefox3.6　で確認
+				if( X_UA.Gecko && that._tag === 'IFRAME' && ( ( v = attrs[ 'src' ] ) || X_Object_inObject( 'src', attrs ) ) ){
+					elm.contentWindow.location.replace = elm.src = v || '';
+					delete attrs[ 'src' ];
+				};
+						
 				for( k in attrs ){
-					if( !X_UA.MacIE && ( X_UA.IE5 || X_UA.IE55 ) ){ // IETester 5.5 ではエラーが出なかった．MultipulIE5.5 ではエラーが出たので
-						if( that._tag === 'TEXTAREA' && k === 'value' ){
-							elm.firstChild ?
-								( elm.firstChild.data = attrs[ k ] ) :
-								elm.appendChild( document.createTextNode( attrs[ k ] ) );
-							continue;
-						};
-					};
-					// TODO IE では input, なぜか buttonも、type の変更が出来ない、object も 同値で置き換えようとしても不可
+					//if( X_EMPTY_OBJECT[ k ] ) continue;
+					// TODO IE では input, なぜか button, object も type の変更が出来ない、同値で置き換えようとしても不可
 					( v = attrs[ k ] ) === undefined ?
 						elm.removeAttribute( rename[ k ] || k ) :
-						( elm[ rename[ k ] || k ] = X_Node_Attr_noValue[ k ] ? k : v );				
-
+						( elm[ rename[ k ] || k ] = X_Node_Attr_noValue[ k ] ? k : v );
 				};
 				delete that._newAttrs;
 			};
 			
+			// style
+			// TODO display:none の場合、更新をスキップ
+			if( that._dirty & X_Node_Dirty.CSS ){
+				if( that._cssText !== null || ( that._cssText = X_Node_CSS_objToCssText( that ) ) ){
+					X_UA.Opera78 || X_UA.NN6 ?
+						elm.setAttribute( 'style', that._cssText ) : // opera8用
+						( elm.style.cssText = that._cssText );
+				} else {
+					elm.style.cssText = ''; // IE5.5以下 Safari3.2 で必要
+					elm.removeAttribute( 'style' );
+					delete that._cssText;
+				};
+			};
+			
 			delete that._dirty;
 		}) :
 	X_UA_DOM.IE4 ? 
@@ -1197,6 +1210,7 @@ var X_Node__updateRawNode =
 			if( that._dirty & X_Node_Dirty.ATTR && ( attrs = that._newAttrs || that._attrs ) ){
 				rename = X_Node_Attr_renameForDOM;
 				for( k in attrs ){
+					//if( X_EMPTY_OBJECT[ k ] ) continue;
 					( v = attrs[ k ] ) === undefined ?
 						elm.removeAttribute( rename[ k ] || k ) :
 					//that._tag === 'TEXTAREA' && k === 'value' ?
@@ -1313,7 +1327,7 @@ var X_Node__actualCreate =
 
 var X_Node__afterActualCreate =
 	X_UA_DOM.W3C ? (function( that ){
-		var elm = that._rawObject, xnodes, l, attrs, k, i;
+		var elm = that._rawObject, xnodes, l, i;
 
 		that._root  = that.parent._root;
 		
@@ -1326,11 +1340,17 @@ var X_Node__afterActualCreate =
 		l      = xnodes && xnodes.length;
 		
 		if( that._isNew ){
-			if( !X_Node_useDocumentFragment && l ){// docFrg が使えない場合、doc 追加後に子を追加
+			if( !X_Node_useDocumentFragment /*&& l*/ ){// docFrg が使えない場合、doc 追加後に子を追加
 				for( i = 0; i < l; ++i ){
 					elm.appendChild( X_Node__actualCreate( xnodes[ i ], true ) );
+					X_Node__afterActualCreate( xnodes[ i ] );
+				};
+			} else {
+				for( i = 0; i < l; ++i ){
+					X_Node__afterActualCreate( xnodes[ i ] );
 				};
 			};
+			
 			if( X_Node_strictElmCreation ){
 				if( that._dirty & X_Node_Dirty.IE_FILTER ){
 					elm.style.filter = X_Node_CSS_objToIEFilterText( that );;
@@ -1341,16 +1361,27 @@ var X_Node__afterActualCreate =
 				that._newAttrs = that._attrs;
 				that._dirty = X_Node_Dirty.ID | X_Node_Dirty.CLASSNAME | X_Node_Dirty.CSS | X_Node_Dirty.ATTR | X_Node_Dirty.IE_FILTER;
 				X_Node__updateRawNode( that, elm );
+				
+				// http://outcloud.blogspot.jp/2010/09/iframe.html
+				// この問題は firefox3.6　で確認
+				if( X_UA.Gecko && that._tag === 'IFRAME' ){
+					if( !that._attrs[ 'src' ] ){
+						elm.contentWindow.location.replace = elm.src = 'about:blank'; 
+					};
+				};
 			};
 			
 			delete that._isNew;
 		} else {
+			
+			for( i = 0; i < l; ++i ){
+				X_Node__afterActualCreate( xnodes[ i ] );
+			};
+			// 親要素の updateRawNode 前に子要素の updateRawNode を行う
+			// 親要素が GPU レイヤーに転送されるケースがあるので、先に子要素の変更を済ませる
 			that._dirty && X_Node__updateRawNode( that, elm );
-		};
-		
-		for( i = 0; i < l; ++i ){
-			X_Node__afterActualCreate( xnodes[ i ] );
-		};
+		};	
+
 		// src の　onload があるので先ではないか？
 		// TODO ie の str から要素を作る場合、srcだけ イベント設定後ではないか？
 		X_EventDispatcher_toggleAllEvents( that, true );// イベントの復帰
diff --git a/0.6.x/js/02_dom/03_XDomEvent.js b/0.6.x/js/02_dom/03_XDomEvent.js
index 0700cec..8708746 100644
--- a/0.6.x/js/02_dom/03_XDomEvent.js
+++ b/0.6.x/js/02_dom/03_XDomEvent.js
@@ -342,14 +342,6 @@ if( !X_UA.IE || 9 <= X_UA.IE ){
 	};
 };
 
-X.Dom.Event.ANIME_BEFORE_START  = ++X_Event_last;
-X.Dom.Event.ANIME_START         = ++X_Event_last;
-X.Dom.Event.ANIME               = ++X_Event_last;
-X.Dom.Event.ANIME_END           = ++X_Event_last;
-X.Dom.Event.ANIME_BEFORE_STOP   = ++X_Event_last; // xnode.stop() のみ、指定時間による停止では呼ばれない
-X.Dom.Event.ANIME_STOP          = ++X_Event_last;
-
-
 // TODO load -> readystatechange this.readyState === "loaded" || this.readyState === "complete"
 /*
 X.Dom.Event._LOAD_FIX_TAGS = {
diff --git a/0.6.x/js/02_dom/04_XBoxModel.js b/0.6.x/js/02_dom/04_XBoxModel.js
index 0a5c342..edddde6 100644
--- a/0.6.x/js/02_dom/04_XBoxModel.js
+++ b/0.6.x/js/02_dom/04_XBoxModel.js
@@ -323,13 +323,6 @@ Node.prototype.offset = function( /* xnodeParent */ ){
 	};
 	
 	return X_Node_getPosition( elm );
-	
-	while( elm && elm !== document.body ){
-		x += elm.offsetLeft;
-		y += elm.offsetTop;
-		elm = elm.offsetParent || elm.parentNode || elm.parentElement;
-	};
-	return { x : x, y : y };
 };
 
 // エレメントの座標取得 ～スクロール要素～
@@ -350,16 +343,16 @@ var X_Node_getPosition =
 		} :
 	X.UA.Opera < 10 ?
 		function( el ){
-	            var ex  =   0;
-	            var ey  =   0;
-	            do
-	            { 
-	                ex  +=  el.offsetLeft;
-	                ey  +=  el.offsetTop;
-	            }
-	            while(  el  =   el.offsetParent );
-	            //
-	            return  {x:ex,y:ey};
+            var ex  =   0;
+            var ey  =   0;
+            do
+            { 
+                ex  +=  el.offsetLeft;
+                ey  +=  el.offsetTop;
+            }
+            while(  el  =   el.offsetParent );
+            //
+            return  {x:ex,y:ey};
 		} :
 		function(target)
         {
diff --git a/0.6.x/js/02_dom/05_XNodeAttr.js b/0.6.x/js/02_dom/05_XNodeAttr.js
index 3fc530c..8b1237a 100644
--- a/0.6.x/js/02_dom/05_XNodeAttr.js
+++ b/0.6.x/js/02_dom/05_XNodeAttr.js
@@ -68,22 +68,24 @@ X_Node_Attr_renameForTag = {};
 	// 先頭にスペース
 function X_Node_Attr_objToAttrText( obj ){
 		var noValue = X_Node_Attr_noValue,
-			attrs = [ '' ], n = 0, p, v;
+			attrs = [ '' ], n = 0, k, v;
 		if( !obj ) return ''; // Opera7
-		for( p in obj ){
-			v = obj[ p ];
-			if( p === 'value' ){
+		for( k in obj ){
+			//if( X_EMPTY_OBJECT[ k ] ) continue;
+			v = obj[ k ];
+			if( k === 'value' ){
 				v = v.split( '"' ).join( '&quot;' ).split( '>' ).join( '&gt;' ).split( '<' ).join( '&lt;' );
 			};
-			attrs[ ++n ] = noValue[ p ] ? p : [ p, '="', v, '"' ].join( '' );
+			attrs[ ++n ] = noValue[ k ] ? k : [ k, '="', v, '"' ].join( '' );
 		};
 		return 0 < n ? attrs.join( ' ' ) : '';
 };
 
 (function( renameForDOM, renameForTag ){
-	var name, i;
-	for( name in renameForDOM ){
-		renameForTag[ renameForDOM[ name ] ] = name;
+	var k, i;
+	for( k in renameForDOM ){
+		//if( X_EMPTY_OBJECT[ k ] ) continue;
+		renameForTag[ renameForDOM[ k ] ] = k;
 	};
 })( X_Node_Attr_renameForDOM, X_Node_Attr_renameForTag );
 
@@ -91,14 +93,13 @@ function X_Node_Attr_objToAttrText( obj ){
 
 /* --------------------------------------
  *  attribute
- *  X_Node_Attr_toIndex に定義されている 属性の場合
  * 
  * http://nanto.asablo.jp/blog/2005/10/29/123294
  * className, onclick等 はここで設定しない
  * 
  */
 Node.prototype.attr = function( nameOrObj /* v */ ){
-	var attrs = this._attrs, newAttrs, f, p, elm, v;
+	var attrs = this._attrs, newAttrs, f, k, elm, v;
 	
 	if( this._xnodeType !== 1 ) return this;
 	
@@ -106,13 +107,14 @@ Node.prototype.attr = function( nameOrObj /* v */ ){
 		attrs || ( attrs = this._attrs = {} );
 		newAttrs = this._newAttrs || ( this._newAttrs = {} );
 		
-		for( p in nameOrObj ){
-			if( X_Node_Attr_setAttr( this, attrs, newAttrs, p, nameOrObj[ p ] ) === true ) f = true;
+		for( k in nameOrObj ){
+			//if( X_EMPTY_OBJECT[ k ] ) continue;
+			if( X_Node_Attr_setAttr( this, attrs, newAttrs, k, nameOrObj[ k ] ) === true ) f = true;
 		};
 		if( f ){
 			this._attrText = false;
 			this._dirty |= X_Node_Dirty.ATTR;
-			this._root && X_Node_reserveUpdate();			
+			this._root && X_Node_reserveUpdate();
 		};
 		return this;
 	} else
@@ -142,12 +144,19 @@ Node.prototype.attr = function( nameOrObj /* v */ ){
 			case 'text' :
 				return this.text();
 			case 'html' :
+			case 'innerHTML' :
 				return this.html();
+			case 'outerHTML' :
+				X_Node_outerXNode = this;
+				v = this.html();
+				X_Node_outerXNode = null;
+				return v;
+
 			case 'selected' :
 				// kquery.js : safariのバグ対策
 				// if ($.browser.safari && key === "selected" && tmp) tmp.selectedIndex;
 				// 親ノードの selectedIndex の getter を呼んでおくと値が正しくなる、ということ?( by itozyun )
-				if( X_UA.WebKit ) this._rawObject.parentNode.selectedIndex;
+				if( X_UA.WebKit ) this._rawObject.parentNode && this._rawObject.parentNode.selectedIndex;
 			case 'value' :
 				if( this._tag === 'INPUT' && X_Node_Attr_STATIC_VALUE_TYPES[ attrs[ 'type' ] ] ) break;
 			case 'checked' :
@@ -174,6 +183,7 @@ function X_Node_Attr_setAttr( that, attrs, newAttrs, name, v ){
 			return;
 		case 'id' :
 			v = ( v !== 'ie4uid' + that._uid ) ? v : undefined;
+			// TODO unique の　check
 			if( v !== that._id ){
 				that._id = v;
 				that._dirty |= X_Node_Dirty.ID;
diff --git a/0.6.x/js/02_dom/06_XNodeCSS.js b/0.6.x/js/02_dom/06_XNodeCSS.js
index f898b74..13e5450 100644
--- a/0.6.x/js/02_dom/06_XNodeCSS.js
+++ b/0.6.x/js/02_dom/06_XNodeCSS.js
@@ -254,10 +254,10 @@ function X_Node_CSS_objToCssText( that ){
 	if( !obj ) return ''; // Opera7.5 未満?
 	
 	for( p in obj ){
-		v = obj[ p ];
-	
 		// object の拡張に備えて plain なオブジェクトを用意し、そのメンバーと一致するものは処理の対象外。
-		if( plain[ p ] === v ) continue;
+		if( plain[ p ] ) continue;
+			
+		v = obj[ p ];
 		
 		p = X_Node_CSS_uncamelize( X_Node_CSS_VENDER_PREFIX[ p ] || p );
 		
@@ -300,6 +300,8 @@ function X_Node_CSS_objToIEFilterText( that, opt_css ){
 		p, id, v, num, ary, params, i, l, dir,
 		afterUpdate, impossible;
 	for( p in obj ){
+		if( X_EMPTY_OBJECT[ p ] ) continue;
+		
 		if( !( id = test[ p ] ) ) continue;
 		v = obj[ p ];
 		
@@ -492,7 +494,7 @@ Node.prototype.css = function( nameOrObj /* orUnitID, valuOrUnitOrName */ ){
 		camelize = X_Node_CSS_camelize;
 		ieFix    = X_Node_CSS_FILTER_FIX_PROPS;
 		for( p in nameOrObj ){
-			if( plain[ p ] === nameOrObj[ p ] ) continue;
+			if( plain[ p ] ) continue;
 			
 			if( ieFix && ieFix[ p ] ){
 				this._dirty |= X_Node_Dirty.IE_FILTER;
@@ -701,13 +703,13 @@ X.CSS = {
  */
 
 (function(){
-	var testStyle = X_UA.IE4 ? {} : ( document.documentElement || document.createElement( 'div' ) ).style,
+	var testStyle = X_UA.IE4 ? {} : ( /*document.documentElement ||*/ document.createElement( 'div' ) ).style,
 		temp      = testStyle.cssText,
 		vendors   = 'webkit,Webkit,Moz,moz,Ms,ms,O,o,khtml,Khtml'.split( ',' ),
 		searches  = (
 			'opacity,boxSizing,boxShadow,' +
 			'transform,transformOrigin,perspective,' +
-			'transisiton,transitionDelay,transitionProperty,transitionDuration,transitionTimingFunction,backfaceVisibility,willChange,' +
+			'transisiton,transitionDelay,transitionProperty,transitionDuration,transitionTimingFunction,backfaceVisibility,willChange,filter,' +
 			'userSelect,touchSelect,touchAction,touchCallout,contentZooming,userDrag,tapHighlightColor' ).split( ',' ),
 		vendor, i, search, prop, j, v;
 
diff --git a/0.6.x/js/02_dom/07_XNodeList.js b/0.6.x/js/02_dom/07_XNodeList.js
index f1a073a..73f3faf 100644
--- a/0.6.x/js/02_dom/07_XNodeList.js
+++ b/0.6.x/js/02_dom/07_XNodeList.js
@@ -52,11 +52,12 @@ X_NodeList.prototype.each = function( func /* opt_args... */ ){
 /* --------------------------------------
  *  Fuction Base, multi, getter, setter,
  */
-X_ViewPort.listenOnce( X_TEMP.SYSTEM_EVENT_PRE_INIT, function(){
+X_TEMP.onSystemReady.push( function( sys ){
 	var target = X_NodeList.prototype,
 		src    = Node.prototype,
 		p, v, multi;
 	for( p in src ){
+		//if( X_EMPTY_OBJECT[ p ] ) continue;
 		v = src[ p ];
 		if( X.Type.isFunction( v ) && !target[ p ] ){
 			target[ p ] = multi = new Function( [
@@ -69,4 +70,3 @@ X_ViewPort.listenOnce( X_TEMP.SYSTEM_EVENT_PRE_INIT, function(){
 	};
 });
 
-
diff --git a/0.6.x/js/02_dom/10_XNodeAnime.js b/0.6.x/js/02_dom/10_XNodeAnime.js
index 0343ec8..9a1dc75 100644
--- a/0.6.x/js/02_dom/10_XNodeAnime.js
+++ b/0.6.x/js/02_dom/10_XNodeAnime.js
@@ -65,17 +65,25 @@ var X_Node_ANIMATIONS            = [],
 	X_Node_Anime_hasTransform    = !!X_Node_CSS_VENDER_PREFIX[ 'transform' ],
 	/* Opera mobile で  translateZ(0) が有効だと XY が 0 0 になる */
 	/* GPUレイヤーにいる間に要素のコンテンツを変更をすると transitionend が動かなくなるっぽい Mac safari と firefox, 手当てが済むまでここは常に false */
-	X_Node_Anime_translateZ      = '', //X_Node_CSS_VENDER_PREFIX[ 'perspective' ] && !X.UA.OperaMobile && !X.UA.OperaTablet ? ' translateZ(0)' : '',
-	X_Node_Anime_hasTransition   = !!X_Node_CSS_VENDER_PREFIX[ 'transitionDelay' ] && !X.UA.Opera, // Opera12(XP,8.1) 切った方がスムース
-	X_Node_Anime_transitionProps = X_Node_Anime_hasTransform ? X_Node_CSS_VENDER_PREFIX[ 'transform' ] : 'left,top';
+	X_Node_Anime_translateZ      = X_Node_CSS_VENDER_PREFIX[ 'perspective' ] && !X_UA.OperaMobile && !X_UA.OperaTablet ? ' translateZ(0)' : '',
+	X_Node_Anime_hasTransition   = !!X_Node_CSS_VENDER_PREFIX[ 'transitionDelay' ] && !X_UA.Opera, // Opera12(XP,8.1) 切った方がスムース
+	X_Node_Anime_transitionProps = X_Node_Anime_hasTransform ? X_Node_CSS_VENDER_PREFIX[ 'transform' ] : 'left,top',
+	// transitionEnd イベント中に要素の更新( X_Node_startUpdate() )ができるか？
+	// iOS3+4 では可能、iOS6.1.5 で不可。TODO iOS5　及び他の環境で調査。ダメな場合、anime.html が正しく描画されない。
+	X_Node_updateOnTransitionEnd = X_UA.iOS < 6,
+	X_Node_Anime_onTransition    = false;
 
 // gpu化だけ transformX , willChange
 // 終了位置の変更
 // 中断
 
-
+/*
+ * TODO : scale,  ActiveX transform, zoom, fontSizeScale
+ * TODO : rotate, ActiveX transform
+ */
 Node.prototype.animate = function( start, dest, duration, easing, wait ){
-	var obj = this._anime || ( this._anime = {} );
+	var isNew = !this._anime,
+		obj   = this._anime || ( this._anime = {} );
 	
 	obj.duration  = 0 <= duration && X.Type.isFinite( duration ) ? duration : 500;
 	obj.easing    = ease[ easing ] || ease.circular;
@@ -94,23 +102,29 @@ Node.prototype.animate = function( start, dest, duration, easing, wait ){
 	obj.destY     = ( dest.y || dest.y === 0 ) ? dest.y : obj.destY || 0;
 	obj.destA     = 0 <= dest.opacity && dest.opacity <= 1 ? dest.opacity : obj.destA || 1;
 
-	
-	if( obj.gpuTimerID ){
-		X.Timer.remove( obj.gpuTimerID );
-		delete obj.gpuTimerID;
-	};
-	
-	X_Node_Anime_needsDetection = true;
+	if( X_Node_Anime_onTransition ) return this;
+
 	if( X_Node_Anime_hasTransition ){
+		
+		if( obj.gpuTimerID ){
+			X.Timer.remove( obj.gpuTimerID );
+			delete obj.gpuTimerID;
+		};		
+		
+		X_Node_Anime_needsDetection = true;
+		
 		X_Node_Anime_reserveUpdate( true );
 	} else {
-		X_Node_Anime_updateTimerID || ( X_Node_Anime_updateTimerID = X.Timer.requestFrame( X_Node_Anime_updateAnimationsNoTransition ) );		
+		X_System.unlisten( X.Event.UPDATED, X_Node_Anime_updateAnimationsNoTransition );
+		X_Node_Anime_updateTimerID || ( X_Node_Anime_updateTimerID = X.Timer.requestFrame( X_Node_Anime_updateAnimationsNoTransition ) );
+		
+		isNew && this.dispatch( { type : X.Event.ANIME_START, gpu : false } );
 	};
 
 	X_Node_ANIMATIONS.indexOf( this ) === -1 &&
 		( X_Node_ANIMATIONS[ X_Node_ANIMATIONS.length ] = this );
 	
-	//console.log( 'animate ' + this._id + ' y:' + obj.startY + ' > ' + obj.destY + ' d:' + obj.duration );
+	console.log( 'animate ' + this._id + ' y:' + obj.startX + ' > ' + obj.destX + ' d:' + obj.duration );
 	
 	return this;
 };
@@ -124,7 +138,7 @@ Node.prototype.stop = function(){
 		X_Node_Anime_reserveUpdate();
 	} else {
 		X_Node_ANIMATIONS.splice( X_Node_ANIMATIONS.indexOf( this ), 1 );
-		obj.gpuTimerID && X.Timer.remove( obj.gpuTimerID );
+		//obj.gpuTimerID && X.Timer.remove( obj.gpuTimerID );
 		delete this._anime;		
 	};
 	return this;
@@ -136,6 +150,7 @@ function X_Node_Anime_reserveUpdate( before ){
 		
 		if( X_Node_updateTimerID ){
 			//console.log( before ? '> BEFORE_UPDATE' : '> UPDATED' );
+			before = false;
 			X_System.listenOnce( before ? X.Event.BEFORE_UPDATE : X.Event.UPDATED, X_Node_Anime_updateAnimations );
 		} else {
 			//console.log( '> Timer' );
@@ -148,7 +163,7 @@ function X_Node_Anime_reserveUpdate( before ){
 	};
 };
 
-function X_Node_Anime_updateAnimations( v ){
+function X_Node_Anime_updateAnimations( v, updateNow ){
 	var i = X_Node_ANIMATIONS.length, ret, c = false;
 	
 	//console.log( v.type || v );
@@ -171,7 +186,7 @@ function X_Node_Anime_updateAnimations( v ){
 		};
 	};
 	
-	if( X_Node_Anime_updateTimerID && X_Node_updateTimerID ) X_Node_startUpdate();
+	if( ( X_Node_Anime_updateTimerID || updateNow ) && X_Node_updateTimerID ) X_Node_startUpdate();
 	
 	X_Node_Anime_updateTimerID = 0;
 	X_Node_Anime_reserved = false;
@@ -224,6 +239,7 @@ function X_Node_Anime_detectAnimationLayers(){
 				break;
 			};
 		};
+		
 		if( !parent && xnode._anime.phase !== 15 ){
 			if( xnode._anime.phase === 0 ){
 				// 新規
@@ -239,17 +255,27 @@ function X_Node_Anime_detectAnimationLayers(){
 	X_Node_Anime_needsDetection = false;
 };
 
+/* TODO
+ * 0:無, 1:子のGPU解除待 2:GPU予約, 3:GPU now!, 4:GPU解除予約
+ */
 function X_Node_Anime_updateAnimation( xnode ){
 	var obj   = xnode._anime,
 		phase = obj.phase,
 		current, time;
 	switch( phase ){
+		case 2 :
+			// アニメーション中
+			return false;
+		
 		case -1 :// 子の GPU レイヤー解除待ち
 		case  7 :
 			++obj.phase;
 			break;
 		case  0 : // 開始位置+アニメーションの設定 
 		case  8 :
+			xnode.dispatch( { type : X.Event.ANIME_START, gpu : phase === 8 } );
+			X_ViewPort.unlisten( X.Event.AFTER_UPDATE, xnode, X_Node_Anime_gpuReleased );
+			
 			X_Node_Anime_readyTransition( xnode );
 			X_Node_Anime_updatePosition( xnode, obj.startX, obj.startY, obj.startA, phase === 8 );
 			++obj.phase;
@@ -257,29 +283,42 @@ function X_Node_Anime_updateAnimation( xnode ){
 		case  1 :
 		case  9 : // 終了位置の設定
 			obj.gpuParent = phase === 9;
-			obj.duration ? X_Node_Anime_updateTransition( xnode ) : X_Node_Anime_clearTransition( xnode );
-			X_Node_Anime_updatePosition( xnode, obj.destX, obj.destY, obj.destA, obj.gpuParent );
-			obj.phase = 2;
-			break;
-		
-		case 2 :
-			// アニメーション中
-			return false;
-		
+			if( obj.duration ){
+				xnode.listenOnce( 'transitionend', X_Node_Anime_onTransitionEnd );
+			
+				xnode.css({
+					transitionProperty       : X_Node_Anime_transitionProps + ',opacity,width,height', // X_Node_Anime_readyTransitionに移動??
+					transitionDuration       : obj.duration + 'ms'
+				});
+				
+				X_Node_Anime_updatePosition( xnode, obj.destX, obj.destY, obj.destA, obj.gpuParent );
+				obj.phase = 2;	
+				break;
+			};
+			console.log( 'duration = 0 の場合、アニメーションの解除' );
+			// duration = 0 の場合、アニメーションの解除
+			
 		case 3 : // アニメーションの解除
-			X_Node_Anime_clearTransition( xnode );
 			obj.phase = obj.gpuParent ? 10 : 4;
+			// このタイミングで animation 関連の css を削除したところ、iOS3、4 で再描画忘れが度々起きるように、、、
+			if( !obj.gpuParent ) X_Node_Anime_clearTransition( xnode );
+			xnode.dispatch( { type : X.Event.ANIME_END, gpu : obj.gpuParent } );
 			break;
 
 		case 4 :
-			// アニメーションは停止・GPU = false -> リストから削除
+			// アニメーションは停止・GPU=false -> リストから削除
 			obj.gpuParent = false;
 			return true;
 
 		case 10 :
 			// アニメーションは停止・GPUレイヤーは解除していない(再アニメーションに備えて待機)
+			X_Node_Anime_clearTransition( xnode ); // TODO X_Node_Anime_releaseGPULayer に移動?
 			if( !obj.gpuTimerID ){
-				obj.gpuTimerID = X.Timer.once( obj.wait, xnode, X_Node_Anime_releaseGPULayer );
+				if( obj.wait ){
+					obj.gpuTimerID = X.Timer.once( obj.wait, xnode, X_Node_Anime_releaseGPULayer );
+				} else {
+					X_Node_Anime_releaseGPULayer.call( xnode );
+				};
 			};
 			return false;
 		
@@ -298,6 +337,7 @@ function X_Node_Anime_updateAnimation( xnode ){
 				X_Node_Anime_clearTransition( xnode );
 				X_Node_Anime_updatePosition( xnode, obj.destX, obj.destY, obj.destA, phase === 14 );
 				obj.phase = phase === 14 ? 10 : 4;
+				xnode.dispatch( { type : X.Event.ANIME_END, gpu : obj.gpuParent } );
 			} else {
 				current = X_Node_Anime_getComputedPosition( xnode );
 				obj.startX    = current.x;
@@ -313,13 +353,16 @@ function X_Node_Anime_updateAnimation( xnode ){
 		case 15 :
 			// GPU有効で停止（待機）している xnode の解除
 			//console.log( 'GPU有効で停止（待機）している xnode の解除' + xnode._tag + xnode.getOrder() );
+			console.log( 'GPU有効で停止（待機）している xnode のGPU解除' );
 			X_Node_Anime_clearTransition( xnode );
 			X_Node_Anime_updatePosition( xnode, obj.destX, obj.destY, obj.destA, false );
 			obj.gpuTimerID && X.Timer.remove( obj.gpuTimerID );
+			X_ViewPort.listenOnce( X.Event.AFTER_UPDATE, xnode, X_Node_Anime_gpuReleased );
 			return true;
 		
-		case 100 : // stop() : アニメーションの中断して削除
+		case 100 : // stop() : アニメーションを中断して削除
 			//console.log( 'stop() gpu:' + obj.gpuParent );
+			console.log( 'アニメーションを中断して削除' );
 			current = X_Node_Anime_getComputedPosition( xnode );
 						
 			X_Node_Anime_clearTransition( xnode );
@@ -343,45 +386,54 @@ function X_Node_Anime_getComputedPosition( that ) {
 		y = + parseInt( matrix.top );
 	};
 	
-	return { x: x, y: y, a : matrix[ X_Node_CSS_Support[ 'opacity' ] ] };
+	return { x : x, y : y, a : matrix[ X_Node_CSS_Support[ 'opacity' ] ] };
 };
 
-function X_Node_Anime_onTransitionEnd(){
-	if( this._anime.phase !== 2 ) return X.Callback.PREVENT_DEFAULT;
+function X_Node_Anime_onTransitionEnd( e ){
+	if( !this._anime || this._anime.phase !== 2 ) return X.Callback.PREVENT_DEFAULT | X.Callback.STOP_PROPAGATION;
 	this._anime.phase = 3;
+	
+	console.log( 'トランジション終了' );
+	
+	X_Node_Anime_onTransition = true;
+	this.dispatch( { type : X.Event.ANIME_END, gpu : this._anime.gpuParent } );
+	X_Node_Anime_onTransition = false;
+	
 	X_Node_Anime_needsDetection = true;
-	X_Node_Anime_reserveUpdate();
-	//console.log( 'トランジション終了' );
-	return X.Callback.UN_LISTEN | X.Callback.PREVENT_DEFAULT | X.Callback.STOP_PROPAGATION;
+	// iOS は transitionend 内の 更新でアニメーション可能 iOS3, iOS4 で確認 
+	// win+Gecko は不可
+	X_Node_Anime_updateAnimations( 0, X_Node_updateOnTransitionEnd );
+	
+	return X.Callback.PREVENT_DEFAULT | X.Callback.STOP_PROPAGATION;
 };
 
 function X_Node_Anime_releaseGPULayer(){
-	var obj = this._anime;
+	var obj = this._anime, tmp;
+	if( !obj ){
+		console.log( '_anime無' );
+		return;
+	};
 	X_Node_Anime_updatePosition( this, obj.destX, obj.destY, obj.destA, false );
 	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 );
+};
+
+function X_Node_Anime_gpuReleased(){
+	console.log( 'GPU レイヤーが解放されました' );
+	this.dispatch( { type : X.Event.GPU_RELEASED, gpu : true } );
 };
 
 function X_Node_Anime_readyTransition( xnode ){
 	xnode.css({
-		willChange               : X_Node_Anime_transitionProps + ',opacity,width,height',
+		//zIndex                   : 0,
+		//willChange               : X_Node_Anime_transitionProps + ',opacity,width,height',
 		backfaceVisibility       : 'hidden',
 		transitionTimingFunction : xnode._anime.easing.style,
-		transitionDelay          : '0s'
-	});
-};
-
-function X_Node_Anime_updateTransition( xnode ){
-	// 開始座標のセット(新規のみ)
-	// アニメーション指定のセット(または解除)(対象のみ)
-	// 目標座標のセット
-	xnode.listenOnce( 'transitionend', X_Node_Anime_onTransitionEnd );
-
-	xnode.css({
-		transitionProperty       : X_Node_Anime_transitionProps + ',opacity,width,height',
-		transitionDuration       : xnode._anime.duration + 'ms'
+		transitionDelay          : '0s' // 0.001 にすると transitionend のタイミングが狂う、、、
 	});
 };
 
@@ -389,10 +441,11 @@ function X_Node_Anime_clearTransition( xnode ){
 	// 開始座標のセット(新規のみ)
 	// アニメーション指定のセット(または解除)(対象のみ)
 	// 目標座標のセット
-	xnode.unlisten( 'transitionend', X_Node_Anime_onTransitionEnd );
+	//xnode.unlisten( 'transitionend', X_Node_Anime_onTransitionEnd );
 
 	xnode.css({
-		willChange               : '',
+		//zIndex                   : 1,
+		//willChange               : '',
 		backfaceVisibility       : '',
 		transitionTimingFunction : '',
 		transitionDelay          : '',
@@ -401,6 +454,7 @@ function X_Node_Anime_clearTransition( xnode ){
 };
 
 function X_Node_Anime_updatePosition( xnode, x, y, opacity, useGPU ){
+	//console.log( 'y : ' + y + ' gpu : ' + !!useGPU );
 	if( X_Node_Anime_hasTransform ){
 		xnode.css({
 			transform : 'translate(' + ( x | 0 ) + 'px,' + ( y | 0 ) + 'px)' + ( useGPU ? X_Node_Anime_translateZ : '' ),
@@ -429,10 +483,12 @@ function X_Node_Anime_updateAnimationsNoTransition(){
 
 		if( obj.destTime <= now ){
 			X_Node_Anime_updatePosition( xnode, obj.destX, obj.destY, obj.destA, false );
-			xnode.asyncDispatch( 'transitionend' );
-			
+			//xnode.asyncDispatch( 'transitionend' );
+			delete xnode._anime;
 			X_Node_ANIMATIONS.splice( i, 1 );
-			delete xnode._anime;			
+			
+			// filter な 親が解除されないと子要素への filter が反映されない
+			xnode.asyncDispatch( { type : X.Event.ANIME_END, gpu : false } );
 		} else {
 			easing = obj.easing.fn( ( now - obj.startTime ) / obj.duration );
 			newX   = ( obj.destX - obj.startX ) * easing + obj.startX;
@@ -447,7 +503,12 @@ function X_Node_Anime_updateAnimationsNoTransition(){
 	};
 	
 	if( c ){
-		X_Node_Anime_updateTimerID = X.Timer.requestFrame( X_Node_Anime_updateAnimationsNoTransition );
+		if( X_Node_updateTimerID ){
+			X_System.listen( X.Event.UPDATED, X_Node_Anime_updateAnimationsNoTransition );
+			X_Node_Anime_updateTimerID = 0;
+		} else {
+			X_Node_Anime_updateTimerID = X.Timer.requestFrame( X_Node_Anime_updateAnimationsNoTransition );
+		};
 	} else {
 		X_Node_Anime_updateTimerID = 0;
 	};
diff --git a/0.6.x/js/05_util/01_XNinjaIframe.js b/0.6.x/js/05_util/01_XNinjaIframe.js
index a1fe435..85ae252 100644
--- a/0.6.x/js/05_util/01_XNinjaIframe.js
+++ b/0.6.x/js/05_util/01_XNinjaIframe.js
@@ -35,7 +35,7 @@ X.Util.NinjaIframe = X.EventDispatcher.inherits(
 				}
 			);
 			
-			X.ViewPort.listenOnce( X.Event.AFTER_UPDATE, this );
+			X_ViewPort.listenOnce( X.Event.AFTER_UPDATE, this );
 			
 			// http://nanto.asablo.jp/blog/2011/12/08/6237308
 			// IE 6/7 で文書間通信を実現するための一案
diff --git a/0.6.x/js/06_net/00_XNet.js b/0.6.x/js/06_net/00_XNet.js
index 50bb695..2a0ad3c 100644
--- a/0.6.x/js/06_net/00_XNet.js
+++ b/0.6.x/js/06_net/00_XNet.js
@@ -1,5 +1,8 @@
 // TODO  onlineevent offlineevent, netspeed
 // local への通信に対しては、netspeed を更新しない
+
+// http://bugs.jquery.com/ticket/2709
+// <head><base> がある場合、<script>の追加に失敗する
 X.Net = {
 
 	xhrGet : function( url, type ){
diff --git a/0.6.x/js/06_net/01_XNetXHR.js b/0.6.x/js/06_net/01_XNetXHR.js
index 2ecd889..f488350 100644
--- a/0.6.x/js/06_net/01_XNetXHR.js
+++ b/0.6.x/js/06_net/01_XNetXHR.js
@@ -169,6 +169,7 @@ if( X_Net_XHR_W3C || X_Net_XHR_ACTIVE_X ){
 				// raw.overrideMimeType()
 				if( !X_Net_XHR_ACTIVE_X && X.Type.isFunction( raw.setRequestHeader ) ){
 					for( p in headers ){
+						if( X_EMPTY_OBJECT[ p ] ) continue;
 						raw.setRequestHeader( p, headers[ p ] ); // Opera8.01+, MSXML3+
 					};		
 				};
diff --git a/0.6.x/js/07_audio/00_XAudio.js b/0.6.x/js/07_audio/00_XAudio.js
index 19ff23a..d33dee9 100644
--- a/0.6.x/js/07_audio/00_XAudio.js
+++ b/0.6.x/js/07_audio/00_XAudio.js
@@ -1,5 +1,5 @@
 
-X.Audio = {
+/*
 	WebAudio    : 1,
 	HTML5       : 2,
 	Flash       : 3,
@@ -8,88 +8,54 @@ X.Audio = {
 	WMP         : 6,
 	RealPlayer  : 7,
 	QuickTime   : 8,
-	
-	create : function( sourceList, opt_option ){
-		return new X_AudioProxy( X.Type.isArray( sourceList ) ? X_Object_cloneArray( sourceList ) : [ sourceList ], opt_option || {} );
-	}
-};
-
-var X_Audio_BACKENDS = [],
-	X_Audio_WRAPPER_LIST = [];
-
-/*
- * TODO preplayerror play してみたら error が出た、backend の変更。
  */
 
-function X_Audio_startDetectionBackend( backend, proxy, sourceList, option ){
-	var source = sourceList[ 0 ] || '', 
-		ext    = X_URL_cleanup( source ).split( '.' ).pop(),
-		sup;
-	
-	if( source && backend ){
-		sup      = [ proxy, sourceList, option, source, ext ];
-		sup[ 5 ] = sup;
-		
-		proxy.listenOnce( [ 'support', 'nosupport' ], backend, X_Audio_onEndDetection, sup );
-		backend.detect( proxy, source, ext );
-	} else {
-		proxy.asyncDispatch( 'nobackend' );
-	};
-};
-
-function X_Audio_onEndDetection( e, proxy, sourceList, option, source, ext, sup ){
-	var i = X_Audio_BACKENDS.indexOf( this ), backend;
-	
-	proxy.unlisten( [ 'support', 'nosupport' ], this, X_Audio_onEndDetection, sup );
-	
-	switch( e.type ){
-		case 'support' :
-			proxy._backend = i;
-			proxy.asyncDispatch( {
-				type        : 'backendfound',
-				option      : option,
-				source      : source,
-				backendName : this.backendName
-			} );
-			break;
-		case 'nosupport' :
-			console.log( 'No ' + source + ' ' + this.backendName );
-			if( sup[ 3 ] = source = sourceList[ sourceList.indexOf( source ) + 1 ] ){
-				sup[ 4 ] = ext    = X_URL_cleanup( source ).split( '.' ).pop();
-				proxy.listenOnce( [ 'support', 'nosupport' ], this, X_Audio_onEndDetection, sup );
-				this.detect( proxy, source, ext );
-			} else
-			if( backend = X_Audio_BACKENDS[ i + 1 ] ){
-				X_Audio_startDetectionBackend( backend, proxy, sourceList, option );
-			} else {
-				proxy.asyncDispatch( 'nobackend' );
-			};
-			break;
-	};
-};
+var X_Audio_BACKENDS     = [], // Array.<Hash>
+	X_Audio_WRAPPER_LIST = [], // Array.<AudioWrapper>
+	X_Audio_CAN_PLAY     = 1,
+	X_Audio_NOT_PLAY     = 2;
 
-function X_AudioProxy_getAudioWrapper( proxy ){
+function X_Audio_getAudioWrapper( proxy ){
 	var i = X_Audio_WRAPPER_LIST.length;
 	for( ; i; ){
 		if( X_Audio_WRAPPER_LIST[ --i ].proxy === proxy ) return X_Audio_WRAPPER_LIST[ i ];
 	};
 };
 
-var X_AudioProxy = X.EventDispatcher.inherits(
-	'X.AV.AudioProxy',
+/*
+ * X.Event.BACKEND_READY
+ * X.Event.BACKEND_NONE
+ * 
+ * X.Event.READY   再生可能、実際の状態は canplay から loadeddata まで様々、、、
+ * X.Event.ERROR
+ *   1 : ユーザーによってメディアの取得が中断された
+ *   2 : ネットワークエラー
+ *   3 : メディアのデコードエラー
+ *   4 : メディアがサポートされていない
+ * 
+ * X.Event.MEDIA_PLAYING 再生中に1秒以下のタイミングで発生．currentTime が取れる?
+ * X.Event.MEDIA_LOOP    ループ直前に発生、ｷｬﾝｾﾙ可能
+ * X.Event.MEDIA_LOOPED  ループ時に発生
+ * X.Event.MEDIA_ENDED   再生位置の(音声の)最後についた
+ * X.Event.MEDIA_PAUSED  ポーズした
+ * X.Event.MEDIA_WAITING 再生中に音声が待機状態に。間もなく X.Event.MEDIA_PLAYING に移行。
+ * X.Event.MEDIA_SEEKING シーク中に音声が待機状態に。間もなく X.Event.MEDIA_PLAYING に移行。
+ */
+
+X.Audio = X.EventDispatcher.inherits(
+	'X.Audio',
 	X.Class.POOL_OBJECT,
 	{
 		source      : '',
 		backendName : '',
 		_backend    : -1,
 		
-		Constructor : function( sourceList, option ){
-			X_Audio_startDetectionBackend( X_Audio_BACKENDS[ 0 ], this, sourceList, option );
-			this.listenOnce( [ 'backendfound', 'nobackend', X.Event.KILL_INSTANCE ], X_AudioProxy_handleEvent );
-		},
-		
-		close : function(){
-			return this._backend !== -1 && X_AudioProxy_getAudioWrapper( this ).close();
+		Constructor : function( sourceList, opt_option ){
+			X_Audio_startDetectionBackend(
+				X_Audio_BACKENDS[ 0 ], this,
+				X.Type.isArray( sourceList ) ? X_Object_cloneArray( sourceList ) : [ sourceList ],
+				opt_option || {} );
+			this.listenOnce( [ X.Event.BACKEND_READY, X.Event.BACKEND_NONE, X.Event.KILL_INSTANCE ], X_Audio_handleEvent );
 		},
 		
 		play : function( startTime, endTime, loop, loopStartTime, loopEndTime ){
@@ -104,13 +70,13 @@ var X_AudioProxy = X.EventDispatcher.inherits(
 					loopEndTime   : loopEndTime
 				} );
 			};
-			this._backend !== -1 && X_AudioProxy_getAudioWrapper( this ).play();
+			this._backend !== -1 && X_Audio_getAudioWrapper( this ).play();
 			return this;
 		},
 		
 		seek : function( seekTime ){
 			var state = this.state(),
-				end   = X_AudioWrapper_getEndTime( X_AudioProxy_getAudioWrapper( this ) );
+				end   = X_AudioWrapper_getEndTime( X_Audio_getAudioWrapper( this ) );
 			if( seekTime < end ){
 				this.state( { currentTime : seekTime } );
 			};
@@ -118,12 +84,12 @@ var X_AudioProxy = X.EventDispatcher.inherits(
 		},
 		
 		pause : function(){
-			this.state().playing && X_AudioProxy_getAudioWrapper( this ).pause();
+			this.state().playing && X_Audio_getAudioWrapper( this ).pause();
 			return this;
 		},
 		
 		state : function( obj ){
-			var backend = this._backend !== -1 && X_AudioProxy_getAudioWrapper( this );
+			var backend = this._backend !== -1 && X_Audio_getAudioWrapper( this );
 
 			if( obj === undefined ){
 				return backend ?
@@ -148,7 +114,7 @@ var X_AudioProxy = X.EventDispatcher.inherits(
 		},		
 		
 		loop : function( v ){
-			var backend = this._backend !== -1 && X_AudioProxy_getAudioWrapper( this );
+			var backend = this._backend !== -1 && X_Audio_getAudioWrapper( this );
 			if( v === undefined ){
 				return backend && backend.state().loop;
 			};
@@ -157,7 +123,7 @@ var X_AudioProxy = X.EventDispatcher.inherits(
 		},
 
 		volume : function( v ){
-			var backend = this._backend !== -1 && X_AudioProxy_getAudioWrapper( this );
+			var backend = this._backend !== -1 && X_Audio_getAudioWrapper( this );
 			if( v === undefined ){
 				return backend && backend.state().volume;
 			};
@@ -166,7 +132,7 @@ var X_AudioProxy = X.EventDispatcher.inherits(
 		},
 
 		currentTime : function( v ){
-			var backend = this._backend !== -1 && X_AudioProxy_getAudioWrapper( this );
+			var backend = this._backend !== -1 && X_Audio_getAudioWrapper( this );
 			if( v === undefined ){
 				return backend && backend.state().currentTime;
 			};
@@ -175,31 +141,87 @@ var X_AudioProxy = X.EventDispatcher.inherits(
 		},
 
 		isPlaying : function(){
-			return this._backend !== -1 && X_AudioProxy_getAudioWrapper( this ).state().playing;
+			return this._backend !== -1 && X_Audio_getAudioWrapper( this ).state().playing;
 		}
 		
 	}
 );
 
-function X_AudioProxy_handleEvent( e ){
+function X_Audio_handleEvent( e ){
 	switch( e.type ){
-		case 'backendfound' :
-			this.unlisten( 'nobackend', X_AudioProxy_handleEvent );
+		case X.Event.BACKEND_READY :
+			this.unlisten( X.Event.BACKEND_NONE, X_Audio_handleEvent );
 			this.source = e.source;
 			this.backendName = X_Audio_BACKENDS[ this._backend ].backendName;
-			X_Audio_WRAPPER_LIST.push( new X_Audio_BACKENDS[ this._backend ].klass( this, e.source, e.option ) );
+			X_Audio_WRAPPER_LIST.push(
+				new X_Audio_BACKENDS[ this._backend ]
+				.klass( this, e.source, e.option ) );
 			break;
 		
-		case 'nobackend' :
+		case X.Event.BACKEND_NONE :
 			this.kill();
 			break;
 		
 		case X.Event.KILL_INSTANCE :
-			this.close();
+			this._backend !== -1 && X_Audio_getAudioWrapper( this ).close();
 			break;
 	};
 };
 
+
+/*
+ * TODO preplayerror play してみたら error が出た、backend の変更。
+ */
+
+function X_Audio_startDetectionBackend( backend, proxy, sourceList, option ){
+	var source = sourceList[ 0 ] || '', 
+		ext    = X_URL_getEXT( source ),
+		sup;
+	
+	if( source && backend ){
+		sup      = [ proxy, sourceList, option, source, ext ];
+		sup[ 5 ] = sup;
+		
+		proxy.listenOnce( [ X_Audio_CAN_PLAY, X_Audio_NOT_PLAY ], backend, X_Audio_onEndedDetection, sup );
+		backend.detect( proxy, source, ext );
+	} else {
+		proxy.asyncDispatch( X.Event.BACKEND_NONE );
+	};
+};
+
+function X_Audio_onEndedDetection( e, proxy, sourceList, option, source, ext, sup ){
+	var i = X_Audio_BACKENDS.indexOf( this ), backend;
+	
+	proxy.unlisten( [ X_Audio_CAN_PLAY, X_Audio_NOT_PLAY ], this, X_Audio_onEndedDetection, sup );
+	
+	switch( e.type ){
+		case X_Audio_CAN_PLAY :
+			proxy._backend = i;
+			proxy.asyncDispatch( {
+				type        : X.Event.BACKEND_READY,
+				option      : option,
+				source      : source,
+				backendName : this.backendName
+			} );
+			break;
+		case X_Audio_NOT_PLAY :
+			console.log( 'No ' + source + ' ' + this.backendName );
+			if( sup[ 3 ] = source = sourceList[ sourceList.indexOf( source ) + 1 ] ){
+				sup[ 4 ] = ext    = X_URL_getEXT( source );
+				proxy.listenOnce( [ X_Audio_CAN_PLAY, X_Audio_NOT_PLAY ], this, X_Audio_onEndedDetection, sup );
+				this.detect( proxy, source, ext );
+			} else
+			if( backend = X_Audio_BACKENDS[ i + 1 ] ){
+				X_Audio_startDetectionBackend( backend, proxy, sourceList, option );
+			} else {
+				proxy.asyncDispatch( X.Event.BACKEND_NONE );
+			};
+			break;
+	};
+};
+
+
+
 function X_AudioWrapper_updateStates( audioWrapper, obj ){
 	var playing = audioWrapper.playing,
 		k, v,
diff --git a/0.6.x/js/07_audio/01_XWebAudio.js b/0.6.x/js/07_audio/01_XWebAudio.js
index abd163b..84216ed 100644
--- a/0.6.x/js/07_audio/01_XWebAudio.js
+++ b/0.6.x/js/07_audio/01_XWebAudio.js
@@ -32,7 +32,7 @@ if( X_Audio_WebAudio_context ){
 			loopEndTime     : -1,
 			seekTime        : -1,
 			duration        : 0,
-			
+
 			playing         : false,
 			error           : 0,			
 			loop            : false,
@@ -57,9 +57,8 @@ if( X_Audio_WebAudio_context ){
 			Constructor : function( proxy, url, option ){
 				var audio = X_Audio_WebAudio_getBuffer( url );
 				
-				this.url = url;
-				this.closed = false;
 				this.proxy  = proxy;
+				this.url    = url;
 				
 				X_AudioWrapper_updateStates( this, option );
 				
@@ -111,7 +110,7 @@ if( X_Audio_WebAudio_context ){
 
 					case X.Event.COMPLETE :
 						this.error = 2;				
-						this.proxy.asyncDispatch( { type : 'error', message : 'xhr error' } );
+						this.proxy.asyncDispatch( { type : X.Event.ERROR, message : 'xhr error' } );
 						break;
 				};
 				this.xhr.unlisten( [ X.Event.PROGRESS, X.Event.SUCCESS, X.Event.COMPLETE, X.Event.CANCELED ], this );
@@ -124,17 +123,19 @@ if( X_Audio_WebAudio_context ){
 					this.onDecodeSuccess && this._onDecodeComplete();
 					
 	                if ( !buffer ) {
-	                    this.proxy.asyncDispatch( { type : 'error', message : 'buffer is ' + buffer } );
+	                    this.proxy.asyncDispatch( { type : X.Event.ERROR, message : 'buffer is ' + buffer } );
 	                    return;
 	                };
 	
 	                this.buffer   = buffer;
 	                this.duration = buffer.duration * 1000;
-	                
+	                /*
 	                this.proxy.asyncDispatch( 'loadedmetadata' );
 	                this.proxy.asyncDispatch( 'loadeddata' );
 	                this.proxy.asyncDispatch( 'canplay' );
 	                this.proxy.asyncDispatch( 'canplaythrough' );
+	                */
+					this.proxy.asyncDispatch( X.Event.READY );
 	                
 	                this.autoplay && X.Timer.once( 16, this, this.play );
 	                
@@ -145,7 +146,7 @@ if( X_Audio_WebAudio_context ){
 					console.log( 'WebAudio decode error!' );
 					this._onDecodeComplete();
 					this.error = 3;
-					this.proxy.asyncDispatch( { type : 'error', message : 'decode error' } );
+					this.proxy.asyncDispatch( { type : X.Event.ERROR, message : 'decode error' } );
 				},
 				
 				_onDecodeComplete : function(){
@@ -235,7 +236,7 @@ if( X_Audio_WebAudio_context ){
 						delete this._interval;
 						return X_Callback_UN_LISTEN;
 					};
-					this.proxy.dispatch( 'timeupdate' );
+					this.proxy.dispatch( X.Event.MEDIA_PLAYING );
 				},
 						
 				_onEnded : function(){
@@ -257,13 +258,14 @@ if( X_Audio_WebAudio_context ){
 		            	};
 		            	
 		            	if( this.loop ){
-		            		if( !( this.proxy.dispatch( 'looped' ) & X.Callback.PREVENT_DEFAULT ) ){
+		            		if( !( this.proxy.dispatch( X.Event.MEDIA_BEFORE_LOOP ) & X.Callback.PREVENT_DEFAULT ) ){
 		            			this.looped = true;
+		            			this.proxy.dispatch( X.Event.MEDIA_LOOPED );
 		            			this.play();
-		            		};
+			            	};
 		            	} else {
 		            		this.pause();
-		            		this.proxy.dispatch( 'ended' );
+		            		this.proxy.dispatch( X.Event.MEDIA_ENDED );
 		            	};
 		            };
 				},
@@ -319,18 +321,18 @@ if( X_Audio_WebAudio_context ){
 
 		}
 	);
-	
+
+
 	X_Audio_BACKENDS.push(
 		{
 			backendName : 'Web Audio',
 
 			// 
 			detect : function( proxy, source, ext ){
-				proxy.asyncDispatch( X_Audio_codecs[ ext ] ? 'support' : 'nosupport' );
+				proxy.asyncDispatch( X_Audio_codecs[ ext ] ? X_Audio_CAN_PLAY : X_Audio_NOT_PLAY );
 			},
 			
 			klass : X_Audio_WebAudioWrapper
 		}
 	);
-
 };
diff --git a/0.6.x/js/07_audio/02_XHTMLAudio.js b/0.6.x/js/07_audio/02_XHTMLAudio.js
index 925b0b1..3c721fc 100644
--- a/0.6.x/js/07_audio/02_XHTMLAudio.js
+++ b/0.6.x/js/07_audio/02_XHTMLAudio.js
@@ -7,11 +7,15 @@
 var X_Audio_HTMLAudio_playTrigger =
 		X_UA.iOS ? 'suspend' :
 		X_UA.AndroidBrowser2 ? 'stalled' : // Android 2.3.5(SBM101SH) では stalled は発生しない,,,
-		X_UA.AndroidBrowser4 ? 'loadeddata' : 'canplay',
+		X_UA.AndroidBrowser4 ? 'loadeddata' : 
+		X_UA.OperaMobile || X_UA.OperaTablet ? 'loadeddata' : 'canplay',
 	X_Audio_HTMLAudioWrapper,
 	X_Audio_rawAudio,
 	// Opera Mobile 12 android4.4.4 & 2.3.5 は 2回目以降の currentTime へのセットで currentTime が更新されなくなるため、タイマーを使用する
-	X_Audio_HTMLAudioWrapper_currentTimeFix  = !!X_UA.OperaMobile || !!X_UA.OperaTablet,
+	X_Audio_HTMLAudioWrapper_currentTimeFix  = !!X_UA.OperaMobile || !!X_UA.OperaTablet, // || ( X_UA.WinPhone && X_UA.IE9 ),
+	// Android1.6+MobileOpera12では無理っぽい、、、
+	X_Audio_HTMLAudioWrapper_badOperaAndroid = X_Audio_HTMLAudioWrapper_currentTimeFix && X_UA.Android < 2,
+
 	// 一方 Desktop の Opera12 は、loadeddata 等では duration が infinity で、再生後の durationchange 時に duration が判明する。
 	// opera12 volume, mute の変更が2度目以降できない
 	// duration 判明後には currentTime によるシークと、現在時間の取得が可能になる。
@@ -20,16 +24,17 @@ var X_Audio_HTMLAudio_playTrigger =
 	// Opera12.17 Win32(XP) portable apps は勝手に再生が始まる、、、その際には timeupdate が発行されない、、、　iframe+image+audio で使わないときは破棄する、とか。
 	// opera11、10.54 WinXP はまとも、、、
 	// X_Audio_Sprite_handleEvent でも使用
-	X_Audio_HTMLAudioWrapper_durationFix     = !X_Audio_HTMLAudioWrapper_currentTimeFix && 12 < X_UA.Opera,
+	X_Audio_HTMLAudioWrapper_ieMobile9Fix    = ( X_UA.WinPhone && X_UA.IE9 ),
+	X_Audio_HTMLAudioWrapper_durationFix     = ( !X_Audio_HTMLAudioWrapper_currentTimeFix && 12 <= X_UA.Opera ),
 	
 	X_Audio_HTMLAudioWrapper_shortPlayFix    = !!X_UA.AndroidBrowser4,
 	
 	X_Audio_codecs;
-	
 
-if( window.HTMLAudioElement ){
-	
-	X_Audio_rawAudio = new Audio;
+if( window.HTMLAudioElement && !X_Audio_HTMLAudioWrapper_badOperaAndroid ){
+	//http://himaxoff.blog111.fc2.com/blog-entry-97.html
+	//引数なしで new Audio() とすると、Operaでエラーになるそうなので注意。
+	X_Audio_rawAudio = new Audio( '' );
 	
 	X_Audio_codecs = {
       mp3  : X_Audio_rawAudio.canPlayType('audio/mpeg'),
@@ -37,15 +42,17 @@ if( window.HTMLAudioElement ){
       ogg  : X_Audio_rawAudio.canPlayType('audio/ogg; codecs="vorbis"'),
       wav  : X_Audio_rawAudio.canPlayType('audio/wav; codecs="1"'),
       aac  : X_Audio_rawAudio.canPlayType('audio/aac'),
-      m4a  : (X_Audio_rawAudio.canPlayType('audio/x-m4a') || X_Audio_rawAudio.canPlayType('audio/m4a') || X_Audio_rawAudio.canPlayType('audio/aac')),
-      mp4  : (X_Audio_rawAudio.canPlayType('audio/x-mp4') || X_Audio_rawAudio.canPlayType('audio/mp4') || X_Audio_rawAudio.canPlayType('audio/aac')),
+      m4a  : X_Audio_rawAudio.canPlayType('audio/x-m4a') + X_Audio_rawAudio.canPlayType('audio/m4a') + X_Audio_rawAudio.canPlayType('audio/aac'),
+      mp4  : X_Audio_rawAudio.canPlayType('audio/x-mp4') + X_Audio_rawAudio.canPlayType('audio/mp4') + X_Audio_rawAudio.canPlayType('audio/aac'),
       weba : X_Audio_rawAudio.canPlayType('audio/webm; codecs="vorbis"')
 	};
 	
 	(function( k, v ){
 		for( k in X_Audio_codecs ){
+			if( X_EMPTY_OBJECT[ k ] ) continue;
 			v = X_Audio_codecs[ k ];
-			X_Audio_codecs[ k ] = v && v !== 'no';
+			X_Audio_codecs[ k ] = v && v.split( 'no' ).join( '' );
+			console.log( k + ' ' + X_Audio_codecs[ k ] );
 		};
 	})();
 	
@@ -76,6 +83,7 @@ if( window.HTMLAudioElement ){
 			_loaded          : false,
 			_beginTime       : 0,
 			_playForDuration : 0,
+			_lastCurrentTime : 0,
 			_src             : '',
 			
 			Constructor : function( proxy, source, option ){
@@ -108,17 +116,25 @@ if( window.HTMLAudioElement ){
 						'loadstart', 'load', 'progress', 'suspend', 'abort', 'error', 'emptied', 'stalled', 'play', 'pause', 'loadedmetadata',
 						'loadeddata', 'waiting', 'playing', 'canplay', 'canplaythrough', 'seeking', 'seeked', 'timeupdate', 'ended',
 						'ratechange', 'durationchange', 'volumechange' ], this.handleEventProxy );				
-				
+
+				//document.body.appendChild( this._rawObject );
+				this._rawObject.autoplay = false;
+
 				if( X_Audio_rawAudio === this._rawObject ){
-					X_Audio_rawAudio.src = source;
+					if( X_Audio_HTMLAudioWrapper_badOperaAndroid ){
+						X_Audio_HTMLAudioWrapper_badOperaAndroid && alert( 12 );
+						X_EventDispatcher_toggleAllEvents( this, false );
+						this._rawObject = new Audio( X_URL_toAbsolutePath( source ) );
+						//X_EventDispatcher_toggleAllEvents( this, true );
+					} else {
+						X_Audio_rawAudio.src = source;
+					};
+
+					//this._rawObject = new Audio( X_URL_toAbsolutePath( source ) );
 					/*!X_Audio_Sprite_needTouchFirst && */ X_Audio_rawAudio.load(); // 要る?
 					X_Audio_rawAudio = null;
 				};
 
-				//document.body.appendChild( this._rawObject );
-
-				this._rawObject.autoplay = false;
-				
 				this.listenOnce( X.Event.KILL_INSTANCE );
 			},
 			
@@ -133,24 +149,26 @@ if( window.HTMLAudioElement ){
 			 * http://uguisu.skr.jp/html/table3.html
 			 */
 			handleEventProxy : function( e ){
-				var loaded;
-				console.log( 'HTMLAudio ' + e.type + ' ' + this._rawObject.currentTime );
+				var type, loaded, end, now;
+				
+				X_Audio_HTMLAudioWrapper_badOperaAndroid && alert( e.type );
+				
+				console.log( e.type );
 				
 				switch( e.type ){
 					case 'loadstart' :      // 	ブラウザがコンテンツの検索を開始した場合に発生
 						break;
 					case 'progress' :       // 	ブラウザがコンテンツの取得を実行した場合に発生
 						console.log( e.loaded + ' ' + e.total * 100 + '%' );
-						//this._rawObject.duration &&
-						//	console.dir( this._rawObject );
-							//console.log( this._rawObject.buffered.end(0) / this._rawObject.duration * 100 + '%' );
+						// iem9 で常に0 this._rawObject.networkState;
+						// opera Android 12 で　buffered.end() へのアクセスはエラー　try catch も無効、iem9 は常に end(0) = 0
+						//console.log( 'buffered.end ' + this._rawObject.buffered && this._rawObject.buffered.end(0) ); 
 						break;
 					
 					case 'canplay' :        // 	今すぐに再生を再開できるが、バッファリングが不十分でコンテンツを最後まで表示できないと予測している場合に発生
 						if( X_Audio_HTMLAudioWrapper_durationFix && this._playForDuration === 0 ){
-							console.log( 'start DurationFix for Desktop Opera12 - ' + this._rawObject.duration );
+							//console.log( 'DurationFix開始 - ' + this._rawObject.duration );
 							this._playForDuration = 1;
-							//this._rawObject.currentTime = 0;
 							this._rawObject.play();
 							this._rawObject.currentTime = this._beginTime / 1000; // 必要！
 							return;
@@ -159,57 +177,115 @@ if( window.HTMLAudioElement ){
 					case 'loadeddata' :     // 	コンテンツの表示を現在の再生位置で初めて行えるようになった場合に発生
 					case 'canplaythrough' : // 	今すぐに再生を開始してもバッファリングで停止することなく最後まで表示できると予測している場合に発生
 						if( X_Audio_HTMLAudioWrapper_durationFix && this._playForDuration !== 2 ) return;
-						this.duration = this._rawObject.duration * 1000;
-						console.log( this.duration );
+						this.duration = this.duration || this._rawObject.duration * 1000;
 						break;
 	
+					case 'stalled' :        // 	ブラウザがコンテンツの取得を試みたが、データがまだ用意されていない場合に発生
+						// Android2 で ready 扱い?
 					case 'suspend' :        // 	ブラウザが意図的にコンテンツの取得を現在行っていない場合に発生（ダウンロードは未完了）
+						// iOS で ready 扱い
+					case 'emptied' :        // 	読み込み中に致命的なエラーが発生したか、実行状態ででload()メソッドが実行された場合に発生
 					case 'abort' :          // 	ダウンロードの完了前にコンテンツの取得を停止した場合に発生（この停止はエラーによるものではない）
+						break;
+						
 					case 'error' :          // 	コンテンツの取得実行中にエラーが発生した場合に発生
-					case 'emptied' :        // 	読み込み中に致命的なエラーが発生したか、実行状態ででload()メソッドが実行された場合に発生
-					case 'stalled' :        // 	ブラウザがコンテンツの取得を試みたが、データがまだ用意されていない場合に発生
+						type = X.Event.ERROR;
 						break;
 					
-					
+					case 'playing' :        // 	再生が開始された場合に発生
+						if( X_Audio_HTMLAudioWrapper_currentTimeFix ){
+							this._playTime  = X_Timer_now();
+						};
+						type = X.Event.MEDIA_PLAYING;
 					case 'play' :           // 	再生が開始された。play()メソッドからの復帰後に発生する場合に発生
 					case 'pause' :          // 	再生が一時停止された。pauseメソッドからの復帰後に発生する場合に発生
-					case 'waiting' :        // 	次のフレームが利用不可のため再生を停止したが、そのフレームがやがて利用可能になると想定している場合に発生
-					case 'playing' :        // 	再生が開始された場合に発生	
-					case 'seeking' :        // 	シークがtrueに変化し、イベントを発生させるのに十分な時間がシーク操作にかかっている場合に発生
 					case 'seeked' :         // 	シークがfalseに変化した場合に発生
 					case 'ratechange' :     // defaultPlaybackRate属性とplaybackRate属性のどちらかが更新された場合に発生
 					case 'volumechange' :   // volume属性とmuted属性のどちらかが変化した場合に発生
 						if( this._playForDuration === 1 ) return;
 						break;
 						
-					case 'timeupdate' :     // 	通常の再生が行われ現在の再生位置の変化が起こった場合に発生
-						console.log( this._rawObject.currentTime );
-						if( this._playForDuration === 1 ){
-							this._rawObject.currentTime = this._beginTime / 1000; // 必要！
-							return;
-						};	
-						this._onEnded();
+					case 'waiting' :        // 	次のフレームが利用不可のため再生を停止したが、そのフレームがやがて利用可能になると想定している場合に発生
+						type = X.Event.MEDIA_WAITING;
+					case 'seeking' :        // 	シークがtrueに変化し、イベントを発生させるのに十分な時間がシーク操作にかかっている場合に発生
+						type = type || X.Event.MEDIA_SEEKING;
+						if( this._playForDuration === 1 ) return;
 						break;
-					
+						
 					case 'ended' :
 						if( !this._closed && this.loop ){
-							this.looped = true;
-							( this.proxy.dispatch( 'looped' ) & X.Callback.PREVENT_DEFAULT ) || this.play();
-						} else {
-							this.seekTime = 0;
-							delete this.playing;
+							if( !( this.proxy.dispatch( X.Event.MEDIA_BEFORE_LOOP ) & X.Callback.PREVENT_DEFAULT ) ){
+								this.looped = true;
+								this.proxy.dispatch( X.Event.MEDIA_LOOPED );
+								this.play();
+							};
+							return;
 						};
+						type = X.Event.MEDIA_ENDED;
+						this.seekTime = 0;
+						delete this.playing;
 						break;
 	
+					case 'timeupdate' :     // 	通常の再生が行われ現在の再生位置の変化が起こった場合に発生
+						if( X_Audio_HTMLAudioWrapper_ieMobile9Fix ){
+							if( this._playForDuration === 1 ){
+								console.log( 'tu ' + this._rawObject.duration );
+								if( !this.duration && X.Type.isFinite( this._rawObject.duration ) ){
+									this.duration = this.duration || this._rawObject.duration * 1000;
+									this._playForDuration = 2;
+									
+					                //this.proxy.asyncDispatch( 'loadedmetadata' );
+					                //this.proxy.asyncDispatch( 'loadeddata' );
+					                //this.proxy.asyncDispatch( 'canplay' );
+					                //this.proxy.asyncDispatch( 'canplaythrough' );
+					                loaded = true;
+					                //console.log( 'durationFix が完了' + this.duration );
+					                break;
+								} else {
+									this._rawObject.currentTime = this._beginTime / 1000; // 必要！
+									return;
+								};
+							} else
+							if( this._rawObject.currentTime === this._lastCurrentTime ){
+								//this.proxy.dispatch( 'seeking' );
+								this.proxy.dispatch( X.Event.MEDIA_WAITING );
+								return;
+							};
+							this._lastCurrentTime = this._rawObject.currentTime;
+						};
+						this.duration = this.duration || this._rawObject.duration * 1000;
+
+			            if( this.playing ){
+			            	end = X_AudioWrapper_getEndTime( this );
+			            	now = X_Audio_HTMLAudioWrapper_currentTimeFix ? X_Timer_now() - this._playTime + this._beginTime : this._rawObject.currentTime * 1000 | 0;
+			            	if( 0 + end <= 0 + now ){ // なぜか iem9 で必要,,,
+				            	if( this.loop ){
+				            		if( !( this.proxy.dispatch( X.Event.MEDIA_BEFORE_LOOP ) & X.Callback.PREVENT_DEFAULT ) ){
+				            			this.looped = true;
+				            			this.proxy.dispatch( X.Event.MEDIA_LOOPED );
+				            			this.play();
+					            	};
+				            	} else {
+				            		this.pause();
+				            		this.proxy.dispatch( X.Event.MEDIA_ENDED );
+				            	};
+			            		return;
+			            	};
+			            } else {
+			            	return;
+			            };
+			            type = X.Event.MEDIA_PLAYING;
+						break;
+						
 					case 'durationchange' : // duration属性が更新された場合に発生
 						
 						if( !X_Audio_HTMLAudioWrapper_durationFix ){
 							this.duration = this._rawObject.duration * 1000;
 						} else
-						// Desktop Opera
-						if( this._rawObject.duration !== 1 / 0 ){
+						// Desktop Opera では Infinity, IEM9 では NaN
+						if( !this.duration && X.Type.isFinite( this._rawObject.duration ) ){
 							
-							console.log( this._rawObject.duration );
+							//console.log( this._rawObject.duration );
 							
 							this.duration = this._rawObject.duration * 1000;
 							
@@ -225,13 +301,16 @@ if( window.HTMLAudioElement ){
 									console.log( '設定 ' + this._beginTime );
 									return;
 								};
-							
+								
+								/*
 				                this.proxy.asyncDispatch( 'loadedmetadata' );
 				                this.proxy.asyncDispatch( 'loadeddata' );
 				                this.proxy.asyncDispatch( 'canplay' );
-				                this.proxy.asyncDispatch( 'canplaythrough' );
+				                this.proxy.asyncDispatch( 'canplaythrough' ); */
+				               
+				                
 				                loaded = true;
-				                console.log( 'Desktop Opera のための currentTime と duration の fix が完了' + this.duration );
+				                console.log( 'durationFix が完了' + this.duration );
 				                
 				                if( this.autoplay ){
 									this._rawObject.currentTime = this._beginTime / 1000;	
@@ -247,15 +326,17 @@ if( window.HTMLAudioElement ){
 						break;
 					
 				};
-				//console.log( 'html5 ' + e.type + ' ' + ( this.proxy._listeners && this.proxy._listeners[ e.type ] && this.proxy._listeners[ e.type ].length ) );
-				//e.type === 'canplaythrough' && console.dir( e );
-				loaded || this.proxy.dispatch( e );
 				
-				if( X_Audio_HTMLAudio_playTrigger === e.type || ( X_UA.AndroidBrowser2 && e.type === 'loadeddata' ) || loaded ){
-					!this._loaded && this.autoplay && X.Timer.once( 16, this, this.play );
+				
+				if( !this._loaded && ( loaded || e.type === X_Audio_HTMLAudio_playTrigger || e.type === 'loadeddata' ) ){
+					this.autoplay && X.Timer.once( 16, this, this.play );
 					this._loaded = true;
-					console.log( 'Loaded! ' + e.type );
+					this.proxy.dispatch( X.Event.READY );
+					console.log( 'Loaded! ' + e.type + ' d:' + ( this.duration | 0 ) );
+					return;
 				};
+				
+				loaded || ( type && this.proxy.dispatch( type ) );
 			},
 			
 			close : function(){
@@ -280,8 +361,13 @@ if( window.HTMLAudioElement ){
 	            	return;
 				};
 
+				if( X_Audio_HTMLAudioWrapper_ieMobile9Fix && this._playForDuration === 0 ){
+					console.log( 'DurationFix開始 - ' + this._rawObject.duration );
+					this._playForDuration = 1;
+				};
+
 				end   = X_AudioWrapper_getEndTime( this );
-				begin = X_AudioWrapper_getStartTime( this, end, true );
+				begin = this._beginTime = X_AudioWrapper_getStartTime( this, end, true );
 
 	            if( X_Audio_HTMLAudioWrapper_shortPlayFix ){
 	            	begin -= end - begin > 1000 ? 200 : 400;
@@ -294,9 +380,6 @@ if( window.HTMLAudioElement ){
 					delete this._playForDuration;
 				};
 
-				this._rawObject.currentTime = begin / 1000;
-
-			    console.log( '[HTMLAudio] play ' + begin + ' -> ' + end );
 			    
 			    if( !this.playing ){
 				    if( X_UA.Chrome ){ // [CHROME][FIX] volume TODO どの version で 修正される？
@@ -309,10 +392,16 @@ if( window.HTMLAudioElement ){
 			    	this._rawObject.play();
 			    	this.playing = true;
 			    };
+				//http://himaxoff.blog111.fc2.com/blog-entry-97.html
+				//Firefox3.6では一度も play() していない状態で currentTime = 0 を実行するとエラーになる。
+				//また、GoogleChrome7 では currentTime = 0 直後に play() すると、pause()した位置前後の音が混ざることがある。(少なくとも自分の環境では)
+				this._rawObject.currentTime = this._lastCurrentTime = begin / 1000;
+
+			    console.log( '[HTMLAudio] play ' + begin + ' -> ' + end );
 	            
 	            if( X_Audio_HTMLAudioWrapper_currentTimeFix ){
                 	this._beginTime = begin;
-                	this._playTime  = X_Timer_now();	            	
+                	this._playTime  = X_Timer_now();
 	            };
 
 			},
@@ -321,30 +410,6 @@ if( window.HTMLAudioElement ){
 				_fixForChrome : X_UA.Chrome && function(){
 					!this._closed && ( this._rawObject.volume = this.volume );
 				},
-				
-				_onEnded : function(){
-					var currentTime, time;
-					
-		            if( this.playing ){
-		            	currentTime = X_Audio_HTMLAudioWrapper_currentTimeFix ? X_Timer_now() - this._playTime + this._beginTime : this._rawObject.currentTime * 1000 | 0;
-		            	time        = currentTime - X_AudioWrapper_getEndTime( this );
-
-		            	if( time < 0 ){
-	            			console.log( '> onEnd ' + (-time) + ' ' + currentTime + '/' + ( X_AudioWrapper_getEndTime( this ) ) );
-	            			return;
-		            	};
-		            	
-		            	if( this.loop ){
-		            		if( !( this.proxy.dispatch( 'looped' ) & X.Callback.PREVENT_DEFAULT ) ){
-		            			this.looped = true;
-		            			this.play();
-		            		};
-		            	} else {
-		            		this.pause();
-		            		this.proxy.dispatch( 'ended' );
-		            	};
-		            };
-				},
 			
 			pause : function(){
 				if( !this.playing ) return;
@@ -354,6 +419,11 @@ if( window.HTMLAudioElement ){
 				delete this._playTime;
 
 		        !this._rawObject.error && this._rawObject.pause();
+		        
+		        if( X_Audio_HTMLAudioWrapper_durationFix ){
+		        	this._rawObject.src = '';
+		        	// load();
+		        };
 		        delete this.playing;
 			},
 	
@@ -475,9 +545,9 @@ if( window.HTMLAudioElement ){
 					//console.log( 'HTML Audio ' + ok + ' ext:' + ext );
 				};
 				console.log( 'HTML Audio ' + ok + ' ext:' + ext );
-				proxy.asyncDispatch( ok ? 'support' : 'nosupport' ); */
+				proxy.asyncDispatch( ok ? X_Audio_CAN_PLAY : X_Audio_NOT_PLAY ); */
 				
-				proxy.asyncDispatch( X_Audio_codecs[ ext ] ? 'support' : 'nosupport' );
+				proxy.asyncDispatch( X_Audio_codecs[ ext ] ? X_Audio_CAN_PLAY : X_Audio_NOT_PLAY );
 			},
 			
 			klass : X_Audio_HTMLAudioWrapper
diff --git a/0.6.x/js/07_audio/03_XSilverlightAudio.js b/0.6.x/js/07_audio/03_XSilverlightAudio.js
index 5ef3c25..e64f3da 100644
--- a/0.6.x/js/07_audio/03_XSilverlightAudio.js
+++ b/0.6.x/js/07_audio/03_XSilverlightAudio.js
@@ -69,6 +69,7 @@ if( X.Pulgin.SilverlightEnabled ){
 				// TODO embed
 				this.proxy       = proxy;
 				this._source     = source;
+				// X.Audio._slOnload_ は不可
     			this._onload     = 'XAudioSilverlightOnLoad' + ( ++X_Audio_SLAudio_uid );
 				this._callback   = window[ this._onload ] = X_Callback_create( this, this.onSLReady );
     			this.xnodeObject = X_Node_body
@@ -109,13 +110,14 @@ if( X.Pulgin.SilverlightEnabled ){
 					'</Canvas>'));
 		
 				this._rawObject = sender.findName('media'); // x:Name='media'
-				
+
 				this.listen( [ 'MediaFailed', 'MediaOpened', 'MediaEnded', 'CurrentStateChanged' ] );
 			},
 			
 			handleEvent : function( e ){
 				var lastState, currentState;
 				
+				console.log( e.type );
 				switch( e.type ){
 					
 					case 'MediaFailed' :
@@ -123,18 +125,19 @@ if( X.Pulgin.SilverlightEnabled ){
 						this.playing = false;
 						this._ended  = true;
 						this._paused = false;
-						this.proxy.dispatch( 'error' ); // open failed
+						this.proxy.dispatch( X.Event.ERROR ); // open failed
 						break;
 
 					case 'MediaOpened' :
 						// http://msdn.microsoft.com/ja-jp/library/bb979710(VS.95).aspx
 						this.duration = this._rawObject.NaturalDuration.Seconds * 1000;
 						// TODO 'canplaythrough'
-						this.proxy.asyncDispatch( 'loadstart' );
-		                this.proxy.asyncDispatch( 'loadedmetadata' );
-		                this.proxy.asyncDispatch( 'loadeddata' );
-		                this.proxy.asyncDispatch( 'canplay' );
-		                this.proxy.asyncDispatch( 'canplaythrough' );
+						//this.proxy.asyncDispatch( 'loadstart' );
+		                //this.proxy.asyncDispatch( 'loadedmetadata' );
+		                //this.proxy.asyncDispatch( 'loadeddata' );
+		                //this.proxy.asyncDispatch( 'canplay' );
+		                //this.proxy.asyncDispatch( 'canplaythrough' );
+		                this.proxy.asyncDispatch( X.Event.READY );
 		                
 		                this.autoplay && X.Timer.once( 16, this, this.play );
 						break;
@@ -159,10 +162,10 @@ if( X.Pulgin.SilverlightEnabled ){
 							case 'Opening' :
 								switch( this._lastUserAction ){
 									case 'play' :
-										this.proxy.dispatch( 'waiting' );
+										this.proxy.dispatch( X.Event.MEDIA_WAITING );
 										break;
 									case 'seek' :
-										this.proxy.dispatch( 'seeking' );
+										this.proxy.dispatch( X.Event.MEDIA_SEEKING );
 										break;
 									case 'pause' :
 										break;
@@ -179,7 +182,7 @@ if( X.Pulgin.SilverlightEnabled ){
 								this.playing = false;
 								this._ended  = true;
 								this._paused = false;
-								this.proxy.dispatch( 'error' );
+								this.proxy.dispatch( X.Event.ERROR );
 								break;
 
 							// userAction.pause()		   -> MediaState('Paused') -> x
@@ -194,7 +197,7 @@ if( X.Pulgin.SilverlightEnabled ){
 										this.seekTime = 0;
 										this._ended   = true;
 										this._paused  = false;
-										this.proxy.dispatch( 'ended' );
+										this.proxy.dispatch( X.Event.MEDIA_ENDED );
 										this._currentTime( this.startTime );
 										break;
 									case 'pause':
@@ -213,7 +216,7 @@ if( X.Pulgin.SilverlightEnabled ){
 								this.playing = true;
 								this._ended  = false;
 								this._paused = false;
-								this.proxy.dispatch( 'playing' );
+								this.proxy.dispatch( X.Event.MEDIA_PLAYING );
 								break;
 
 							// stop()
@@ -229,7 +232,7 @@ if( X.Pulgin.SilverlightEnabled ){
 					case X.Event.KILL_INSTANCE :
 						if( this._onload ){
 							// window への delete に ie5 は対応しないが、そもそも ie5 は Silverlight に非対応
-							delete window[ this._onload ];
+							window[ this._onload ] = null;
 							delete this._onload;
 							X_Callback_correct( this._callback );
 						};
@@ -240,7 +243,7 @@ if( X.Pulgin.SilverlightEnabled ){
 			
 			close : function(){
 				this.playing && this.pause();
-				this.proxy.dispatch( 'ended' );
+				this.proxy.dispatch( X.Event.MEDIA_ENDED );
 				this.kill();
 			},
 			
@@ -258,16 +261,17 @@ if( X.Pulgin.SilverlightEnabled ){
 				this._lastUserAction = 0 <= this.seekTime ? 'seek' : 'play';
 				
 				end   = X_AudioWrapper_getEndTime( this );
-				begin = X_AudioWrapper_getStartTime( this, end, true );
+				begin = X_AudioWrapper_getStartTime( this, end, true ) | 0;
 				
 				console.log( '[SLAudio] play ' + begin + ' -> ' + end );
 				
 			    this._rawObject.Volume = this.volume;
+			    this._beginTime = begin;
 			    this._currentTime( begin );
 			    
 			    if( !this.playing ){
 				    this._rawObject.play();
-		            this.proxy.dispatch( 'play' );
+		            //this.proxy.dispatch( 'play' );
 		            
 		            this.playing = true;
 			    };
@@ -290,16 +294,25 @@ if( X.Pulgin.SilverlightEnabled ){
 						delete this._interval;
 						return X_Callback_UN_LISTEN;
 					};
-					this.proxy.dispatch( 'timeupdate' );
+					this.proxy.dispatch( X.Event.MEDIA_PLAYING );
 				},
 				
 				_onEnded : function(){
-					var time;
+					var time, end;
 					delete this._timerID;
 					
 		            if( this.playing ){
+		            	console.log( '> end ' + X_AudioWrapper_getEndTime( this ) + ' current:' + ( this._rawObject.Position.Seconds * 1000 | 0 ) );
+		            	time = this._rawObject.Position.Seconds * 1000 | 0;
+		            	
+		            	if( time <= this._beginTime ){
+		            		console.log( '== waiting' );
+		            		this.proxy.dispatch( X.Event.MEDIA_WAITING );
+		            		this._timerID = X.Timer.once( X_AudioWrapper_getEndTime( this ) - this._beginTime, this, this._onEnded );
+		            		return;
+		            	};
 		            	
-		            	time = this._rawObject.Position.Seconds * 1000 - X_AudioWrapper_getEndTime( this ) | 0;
+		            	time -= X_AudioWrapper_getEndTime( this );
 		            	if( time < 0 ){
 	            			console.log( '> onEnd ' + time );
 	            			this._timerID = X.Timer.once( -time, this, this._onEnded );
@@ -307,13 +320,14 @@ if( X.Pulgin.SilverlightEnabled ){
 		            	};
 		            	
 		            	if( this.loop ){
-		            		if( !( this.proxy.dispatch( 'looped' ) & X.Callback.PREVENT_DEFAULT ) ){
+		            		if( !( this.proxy.dispatch( X.Event.MEDIA_BEFORE_LOOP ) & X.Callback.PREVENT_DEFAULT ) ){
 		            			this.looped = true;
+		            			this.proxy.dispatch( X.Event.MEDIA_LOOPED );
 		            			this.play();
-		            		};
+			            	};
 		            	} else {
 		            		this.pause();
-		            		this.proxy.dispatch( 'ended' );
+		            		this.proxy.dispatch( X.Event.MEDIA_ENDED );
 		            	};
 		            };
 				},
@@ -329,7 +343,7 @@ if( X.Pulgin.SilverlightEnabled ){
 				this._ended   = false;
 							
 				this._rawObject.pause();
-				this.proxy.dispatch( 'pause' );
+				//this.proxy.dispatch( 'pause' );
 			},
 			
 			// SilverlightAudio.state
@@ -343,9 +357,9 @@ if( X.Pulgin.SilverlightEnabled ){
 				    	loopStartTime : this.loopStartTime < 0 ? this.startTime : this.loopStartTime,
 				    	loopEndTime   : this.loopEndTime < 0 ? ( this.endTime || this.duration ) : this.loopEndTime,
 				    	
-				    	currentTime   : this.playing ? this._rawObject.Position.Seconds * 1000 : this.seekTime,
-				    	
-				    	
+				    	// 整数化 しておかないと seek 時に不具合がある。
+				    	currentTime   : this.playing ? this._rawObject.Position.Seconds * 1000 | 0 : this.seekTime,
+
 				        loop          : this.loop,
 				        looped        : this.looped,
 				        volume        : this.volume,
@@ -366,7 +380,7 @@ if( X.Pulgin.SilverlightEnabled ){
 						this._timerID && X.Timer.remove( this._timerID );
 						
 						if( halfway ){
-							this._timerID = X.Timer.once( end - this._rawObject.Position.Seconds * 1000, this, this._onEnded );
+							this._timerID = X.Timer.once( end - this._rawObject.Position.Seconds * 1000 | 0, this, this._onEnded );
 						} else {
 							delete this._timerID;
 						};
@@ -399,7 +413,7 @@ if( X.Pulgin.SilverlightEnabled ){
 
 		detect : function( proxy, source, ext ){
 			var ok = ext === 'mp3' || ext === 'wma' || ext === 'wav';
-			proxy.asyncDispatch( ok ? 'support' : 'nosupport' );				
+			proxy.asyncDispatch( ok ? X_Audio_CAN_PLAY : X_Audio_NOT_PLAY );				
 		},
 		
 		klass : X_Audio_SLAudioWrapper
diff --git a/0.6.x/js/07_audio/10_XAudioSprite.js b/0.6.x/js/07_audio/10_XAudioSprite.js
index 39751ae..717a7c4 100644
--- a/0.6.x/js/07_audio/10_XAudioSprite.js
+++ b/0.6.x/js/07_audio/10_XAudioSprite.js
@@ -4,12 +4,12 @@
  * Mobile Opera11 は Audio をサポートするがイベントが取れない
  * iframe 内で生成して、Audio Sprite の preset で再生できないか？
  */
-var X_Audio_Sprite_shouldUse        = window.HTMLAudioElement && ( X_UA.iOS || X_UA.AndroidBrowser || X_UA.OperaMobile || X_UA.OperaTablet ),
+var X_Audio_Sprite_shouldUse        = window.HTMLAudioElement && ( X_UA.iOS || X_UA.AndroidBrowser || X_UA.OperaMobile || X_UA.OperaTablet ), // Flash がない
 	X_Audio_Sprite_useVideoForMulti = 4 <= X_UA.AndroidBrowser && 534.3 < X_UA.AndroidBrowserWebkit, // ドスパラパッドはビデオのインライン再生が不可 
 	X_Audio_Sprite_needTouchAndroid = X_Audio_Sprite_useVideoForMulti,	
-	X_Audio_Sprite_needTouchFirst   = !!X_UA.iOS || X_Audio_Sprite_useVideoForMulti,
+	X_Audio_Sprite_needTouchFirst   = !!X_UA.iOS || X_Audio_Sprite_needTouchAndroid || ( X_UA.WinPhone && X_UA.IE9 ),
 	X_Audio_Sprite_enableMultiTrack = !( X_UA.iOS && !X_Audio_WebAudio_context ) && !( X_UA.AndroidBrowser4 && X_UA.AndroidBrowserWebkit <= 534.3 ),
-	X_Audio_Sprite_enableVolume     = window.HTMLAudioElement && ( !X_UA.iOS && !X_UA.AndroidBrowser && !X_UA.OperaMobile && !X_UA.OperaTablet ),
+	X_Audio_Sprite_enableVolume     = window.HTMLAudioElement && ( !X_UA.iOS && !X_UA.AndroidBrowser && !X_UA.OperaMobile && !X_UA.OperaTablet ), // TODO fennec は　25以上
 	X_Audio_Sprite_maxTracks        = !X_Audio_Sprite_enableMultiTrack ? 1 : X_Audio_Sprite_useVideoForMulti ? 2 : 9,
 	X_Audio_Sprite_lengthSilence    = 10000, // 一番最初の無音部分の長さ
 	X_Audio_Sprite_lengthDistance   = 5000,  // 音間の無音の長さ
@@ -82,6 +82,14 @@ function X_Audio_Sprite_getTrackEnded(){
  * 	 BGM_01 : [ '15.00', '45.500', true, '17.666', '50.999' ],
  *   BGM_02 : [ '56.00', '1:15.230', true ]
  * }
+ * 
+ * X.Event.BACKEND_READY
+ * X.Event.BACKEND_NONE
+ * 
+ * X.Event.READY
+ * X.Event.MEDIA_LOOPED
+ * X.Event.MEDIA_ENDED
+ * 
  */
 
 X_Audio_Sprite_members = {
@@ -107,7 +115,7 @@ X_Audio_Sprite_members = {
 			
 			for( k in setting ){
 				v = setting[ k ];
-				if( X.Type.isArray( v ) && v !== urls){
+				if( X.Type.isArray( v ) && v !== urls ){
 					v = X.Object.cloneArray( v );
 					for( i = v.length; i; ){
 						--i;
@@ -122,10 +130,10 @@ X_Audio_Sprite_members = {
 				if( video || ( i === 1 && X_Audio_Sprite_useVideoForMulti ) ){
 					option[ 'useVideo' ] = true;
 				};
-				tracks.push( X.Audio.create( urls, X.Object.clone( option ) ) );
+				tracks.push( X.Audio( urls, X.Object.clone( option ) ) );
 			};
 			
-			tracks[ n - 1 ].listenOnce( [ 'backendfound', 'nobackend' ], this, X_Audio_Sprite_handleEvent );
+			tracks[ n - 1 ].listenOnce( [ X.Event.BACKEND_READY, X.Event.BACKEND_NONE ], this, X_Audio_Sprite_handleEvent );
 			
 			X_Audio_Sprite_instance.numTracks = n;
 		},
@@ -158,7 +166,13 @@ X_Audio_Sprite_members = {
 			var tracks = X_Audio_Sprite_TEMP.tracks,
 				i = 0, l = tracks.length;
 			for( ; i < l; ++i ){
-				X_AudioProxy_getAudioWrapper( tracks[ i ] )._rawObject.load();
+				if( X_UA.WinPhone ){
+					console.log( 'touch -> play()' );
+					//tracks[ i ].play( 0, X_Audio_Sprite_lengthSilence, true, 0, X_Audio_Sprite_lengthSilence ).seek( 0 );
+					this.pause( i );
+				} else {
+					X_Audio_getAudioWrapper( tracks[ i ] )._rawObject.load();
+				};
 			};
 		},
 		
@@ -171,7 +185,7 @@ X_Audio_Sprite_members = {
 				bgms    = X_Audio_Sprite_TEMP.BGMs,
 				presets = X_Audio_Sprite_TEMP.presets,
 				preset  = presets[ name ],
-				i, k;
+				track, i, k;
 			
 			if( preset ){
 				if( bgms[ name ] ){
@@ -191,7 +205,7 @@ X_Audio_Sprite_members = {
 						track = X_Audio_Sprite_TEMP.bgmTrack = tracks[ 0 ];
 					};
 					
-					if( track.listen( 'looped', this, X_Audio_Sprite_handleEvent ).isPlaying() ){
+					if( track.listen( X.Event.MEDIA_BEFORE_LOOP, this, X_Audio_Sprite_handleEvent ).isPlaying() ){
 						track
 							.state( {
 								loop          : true,
@@ -213,7 +227,7 @@ X_Audio_Sprite_members = {
 					if( 1 < tracks.length ){
 						track = X_Audio_Sprite_getTrackEnded( X_Audio_Sprite_TEMP.bgmPlaying );
 						track
-							.listen( 'looped', this, X_Audio_Sprite_handleEvent )
+							.listen( X.Event.MEDIA_BEFORE_LOOP, this, X_Audio_Sprite_handleEvent )
 							.state( { looped : false } )
 							.play( preset[ 0 ], preset[ 1 ], true, 0, X_Audio_Sprite_lengthSilence );
 					} else {
@@ -225,7 +239,7 @@ X_Audio_Sprite_members = {
 						};
 						track = tracks[ 0 ];
 					
-						if( track.listen( 'looped', this, X_Audio_Sprite_handleEvent ).isPlaying() ){
+						if( track.listen( X.Event.MEDIA_BEFORE_LOOP, this, X_Audio_Sprite_handleEvent ).isPlaying() ){
 							track
 								.state( {
 									loop          : true,
@@ -302,8 +316,9 @@ X_Audio_Sprite_members = {
 
 function X_Audio_Sprite_handleEvent( e ){
 	var i, tracks, track, _e;
+	
 	switch( e.type ){
-		case 'backendfound' :
+		case X.Event.BACKEND_READY :
 			_e = {
 				type        : e.type,
 				source      : e.source,
@@ -319,15 +334,10 @@ function X_Audio_Sprite_handleEvent( e ){
 			};
 			this.asyncDispatch( _e );
 			
-			e.target.unlisten( 'nobackend', this, X_Audio_Sprite_handleEvent );
-			
-			if( e.backendName === 'HTML Audio' ){
-				// Android 4.4.4 Y!Browser でたまにロードを検出できていない？問題を解決できないかな？ -> , 'canplaythrough'
-				// タッチイベント内でloadを開始。ロード完了したら無音の再生を実施。timeupdate が返ったらいつでも再生が出来る状態になる。
-				e.target.listenOnce( [ X_Audio_HTMLAudio_playTrigger, 'loadeddata', 'canplaythrough' ], this, X_Audio_Sprite_handleEvent );
-			} else {
-				e.target.listenOnce( 'canplaythrough', this, X_Audio_Sprite_handleEvent );
-			};
+			e.target
+				.unlisten( X.Event.BACKEND_NONE, this, X_Audio_Sprite_handleEvent )
+				.listenOnce( X.Event.READY, this, X_Audio_Sprite_handleEvent );
+
 			// READY, needTouchForPlay, needTouchForLoad
 			if( X_Audio_HTMLAudioWrapper_durationFix ){
 				for( i = 0; i < X_Audio_Sprite_TEMP.tracks.length; ++i ){
@@ -336,32 +346,33 @@ function X_Audio_Sprite_handleEvent( e ){
 			};
 			break;
 
-		case 'nobackend' :
-			this.asyncDispatch( e );
-			e.target.unlisten( 'backendfound', this, X_Audio_Sprite_handleEvent );
+		case X.Event.BACKEND_NONE :
+			this.asyncDispatch( X.Event.BACKEND_NONE );
+			e.target.unlisten( X.Event.BACKEND_READY, this, X_Audio_Sprite_handleEvent );
 			break;
 		
-		case 'canplaythrough' :
-		case X_Audio_HTMLAudio_playTrigger :
-		case 'loadeddata' :
-			e.target.unlisten( [ X_Audio_HTMLAudio_playTrigger, 'loadeddata', 'canplaythrough' ], this, X_Audio_Sprite_handleEvent );
-			
+		case X.Event.READY :
 			if( X_Audio_Sprite_needTouchAndroid ){
 				for( i = 0; i < X_Audio_Sprite_TEMP.tracks.length; ++i ){
 					X_Audio_Sprite_instance.pause( i );
 				};
-				e.target.listenOnce( 'timeupdate', this, X_Audio_Sprite_handleEvent ); // Android 標準ブラウザ
+				e.target.listenOnce( X.Event.MEDIA_PLAYING, this, X_Audio_Sprite_handleEvent ); // Android 標準ブラウザ
 				return;
 			};
-		case 'timeupdate' :
-			this.asyncDispatch( 'audioSpriteCanPlay' );
+		case X.Event.MEDIA_PLAYING :
+			this.asyncDispatch( X.Event.READY );
 			break;
 		
-		case 'looped' :
+		case X.Event.MEDIA_BEFORE_LOOP :
 			if( e.target === X_Audio_Sprite_TEMP.bgmTrack ){
 				X_Audio_Sprite_TEMP.bgmLooped = true;
+				this.asyncDispatch( X.Event.MEDIA_LOOPED ); // TODO uid
 			} else {
-				e.target.state().looped || this.asyncDispatch( 'ended' ); // uid
+				if( e.target.state().looped ){
+					//this.asyncDispatch( X.Event.MEDIA_LOOPED ); // TODO uid
+				} else {
+					this.asyncDispatch( X.Event.MEDIA_ENDED ); // TODO uid
+				};
 				
 				// single track | iOS
 				if( X_Audio_Sprite_TEMP.bgmPlaying && !X_Audio_Sprite_TEMP.bgmTrack ){
@@ -373,12 +384,14 @@ function X_Audio_Sprite_handleEvent( e ){
 			break;
 		
 		case X.Event.VIEW_ACTIVATE :
+			console.log( '■ アクティブ' );
 			// track.play(); or iOS need touch??
 			tracks = X_Audio_Sprite_TEMP.pauseTracks;
 			while( tracks.length ) tracks.pop().play();
 			break;
 
 		case X.Event.VIEW_DEACTIVATE :
+			console.log( '■ デアクティブ' );
 			// track.pause();
 			tracks = X_Audio_Sprite_TEMP.tracks;
 			i      = tracks.length;
diff --git a/0.6.x/js/20_ui/02_XUI_Attr.js b/0.6.x/js/20_ui/02_XUI_Attr.js
index 758438b..e29227f 100644
--- a/0.6.x/js/20_ui/02_XUI_Attr.js
+++ b/0.6.x/js/20_ui/02_XUI_Attr.js
@@ -44,6 +44,7 @@ X.UI.Attr = {
 		
 		// 属性定義の上書き
 		for( p in defs ){
+			if( X_EMPTY_OBJECT[ p ] ) continue;
 			if( p === '_last' ) continue;
 			if( !X.Type.isArray( def = defs[ p ] ) ) continue;
 			F[ p ] = def;
@@ -153,6 +154,7 @@ X.UI.Attr.copy = function( proto, supports ){
 	var support, p;
 	
 	for( p in supports ){
+		if( X_EMPTY_OBJECT[ p ] ) continue;
 		if( p === '_last' ) continue;
 		support = supports[ p ];
 		proto[ support.No ] = support[ 0 ];
@@ -180,6 +182,7 @@ X.UI.Attr.preset = function( baseKlass, opt_supports, opt_attrs ){
 	// setAttr に書き換え
 	X.UI.attrClassProto = proto;
 	for( p in opt_attrs ){
+		if( X_EMPTY_OBJECT[ p ] ) continue;
 		opt_supports[ p ] && X.UI._AbstractUINode.prototype.setAttr( p, opt_supports[ p ], opt_attrs[ p ] );
 	};
 	X.UI.attrClassProto = null;
diff --git a/0.6.x/js/20_ui/04_XUI_Event.js b/0.6.x/js/20_ui/04_XUI_Event.js
index 1f1c85f..fce156a 100644
--- a/0.6.x/js/20_ui/04_XUI_Event.js
+++ b/0.6.x/js/20_ui/04_XUI_Event.js
@@ -149,6 +149,7 @@ X.UI.Event = {
 
 ( function( IdToName, NameToID, p ){
 	for( p in IdToName ){
+		if( X_EMPTY_OBJECT[ p ] ) continue;
 		NameToID[ IdToName[ p ] ] = p;
 	};
 })( X.UI.Event.IdToName, X.UI.Event.NameToID );
diff --git a/0.6.x/js/20_ui/06_AbstractUINode.js b/0.6.x/js/20_ui/06_AbstractUINode.js
index 2ad1b6b..14dea01 100644
--- a/0.6.x/js/20_ui/06_AbstractUINode.js
+++ b/0.6.x/js/20_ui/06_AbstractUINode.js
@@ -890,6 +890,7 @@ X.UI.AbstractUINode = X.Class.create(
 				// setter
 				layout = p.parentData && p.parentData.layout.overrideAttrsForChild; // root には parent がない
 				for( k in nameOrObject ){
+					if( X_EMPTY_OBJECT[ k ] ) continue;
 					// 親のレイアウトマネージャの許可しない
 					if( layout && !layout[ k ] ){
 						continue;
diff --git a/0.6.x/js/20_ui/08_Box.js b/0.6.x/js/20_ui/08_Box.js
index 1fa0894..c1a3cbe 100644
--- a/0.6.x/js/20_ui/08_Box.js
+++ b/0.6.x/js/20_ui/08_Box.js
@@ -105,6 +105,7 @@ X.UI._Box = X.UI._AbstractUINode.inherits(
 			};
 			
 			for( p in attrs ){
+				if( X_EMPTY_OBJECT[ p ] ) continue;
 				( support = this.supportAttrs[ p ] ) && this.setAttr( p, support, attrs[ p ] );
 			};
 		},
diff --git a/0.6.x/js/20_ui/15_ScrollBox.js b/0.6.x/js/20_ui/15_ScrollBox.js
index b108e48..b1cec96 100644
--- a/0.6.x/js/20_ui/15_ScrollBox.js
+++ b/0.6.x/js/20_ui/15_ScrollBox.js
@@ -177,7 +177,7 @@ var m      = Math,
 		this.options = new Options();
 
 		// User defined options
-		if( options ) for (i in options) this.options[i] = options[i];
+		if( options ) for (i in options) X_EMPTY_OBJECT[ k ] || ( this.options[i] = options[i] );
 		
 		this.options.hScroll && ( this.hScrollbar = new Scrollbar( 'h', this ) );
 		this.options.vScroll && ( this.vScrollbar = new Scrollbar( 'v', this ) );
-- 
2.11.0