X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F20_ui%2F20_PageRoot.js;h=8890fd4b269b66fa48cd6bf0fb31307e46fbb8c7;hb=eedd028ba64be2ea0828cf686f1d0ec3bb4010d5;hp=eae3e90fe66deb1c04b94391c55989785144f188;hpb=a4b6249d16b938ce6fd1c7691f144ff99729056f;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/20_ui/20_PageRoot.js b/0.6.x/js/20_ui/20_PageRoot.js
index eae3e90..8890fd4 100644
--- a/0.6.x/js/20_ui/20_PageRoot.js
+++ b/0.6.x/js/20_ui/20_PageRoot.js
@@ -1,40 +1,42 @@
+var X_UI_rootData  = null,
+	X_UI_eventBusy = false;
 
-X.UI._eventRellay = function( e ){
-	var font    = X.ViewPort.getBaseFontSize(),
+function X_UI_eventRellay( e ){
+	var font    = X[ 'ViewPort' ][ 'getBaseFontSize' ](),
 		x       = e.clientX / font,
 		y       = e.clientY / font,
 		type    = X.UI.Event.NameToID[ e.type ],
 		i       = 0,
-		data    = X.UI.currentRootData,
+		data    = X_UI_rootData,
 		sysOnly = false,
-		ret     = X.Callback.NONE,
+		ret     = X_Callback_NONE,
 		list, parent, _ret;
 
 	// mouseup で　alert を出すと　mouseleave が発生、ということでイベント中のイベント発火を禁止
-	if( !data || data._eventBusy ) return ret;
+	if( !data || X_UI_eventBusy ) return ret;
 	data._eventBusy = true;
 	
-	if( type !== '' + X.UI.Event._POINTER_MOVE && type !== '' + X.UI.Event._TOUCH_MOVE && type !== '' + X.UI.Event._MOUSE_MOVE ){
+	if( type !== '' + X.UI.Event._POINTER_MOVE ){
 		//console.log( e.type + ' ' + type + ' x:' + x + ', y:' + y );
 	};
 	
 	e.type = type;
 
-	if( data && ( data = data.monopolyNodeData ) && ( ret = data.dispatch( e ) ) & X.Callback.MONOPOLY ){
-		delete X.UI.currentRootData._eventBusy;
-		return ret | X.Callback.PREVENT_DEFAULT;
+	if( data && ( data = data.monopolyNodeData ) && ( ret = data[ 'dispatch' ]( e ) ) & X_Callback_MONOPOLY ){
+		X_UI_eventBusy = false;
+		return ret | X_Callback_PREVENT_DEFAULT;
 	};
 	
-	list = X.UI.currentRootData.hoverList;
-	( X.UI.currentRootData.targetNodeData = X.UI.currentRootData ).capcher( x, y );
-	data = X.UI.currentRootData.targetNodeData;
+	list = X_UI_rootData.hoverList;
+	( X_UI_rootData.targetNodeData = X_UI_rootData ).capcher( x, y );
+	data = X_UI_rootData.targetNodeData;
 
-	//data !== X.UI.currentRootData && console.log( data.xnode.text() );
+	//data !== X_UI_rootData && console.log( data.xnode[ 'text' ]() );
 
 	while( data ){
-		_ret = data.dispatch( e, sysOnly );
+		_ret = data[ 'dispatch' ]( e, sysOnly );
 		ret |= _ret;
-		if( _ret & X.Callback.MONOPOLY || _ret & X.Callback.STOP_PROPAGATION || _ret & X.Callback.STOP_NOW ) break; // sysOnly = true;
+		if( _ret & X_Callback_MONOPOLY || _ret & X_Callback_STOP_PROPAGATION || _ret & X_Callback_STOP_NOW ) break; // sysOnly = true;
 		data = data.parentData;
 	};
 	
@@ -43,21 +45,21 @@ X.UI._eventRellay = function( e ){
 		while( parent.parentData && parent === parent.parentData.hitChildData ){
 			parent = parent.parentData;
 		};
-		if( parent !== X.UI.currentRootData ){
-			data.hoverClassName && data.xnode.removeClass( data.hoverClassName );
-			data._listeners && data._listeners[ X.UI.Event.POINTER_OUT ] && data.dispatch( e, X.UI.Event.POINTER_OUT, false ); // new Event
+		if( parent !== X_UI_rootData ){
+			data.hoverClassName && data.xnode[ 'removeClass' ]( data.hoverClassName );
+			data[ '_listeners' ] && data[ '_listeners' ][ X.UI.Event.POINTER_OUT ] && data[ 'dispatch' ]( e, X.UI.Event.POINTER_OUT, false ); // new Event
 			delete data.hovering;
 			list.splice( i, 1 );
 			continue;
 		};
 		if( !data.hovering ){
 			data.hoverClassName && data.xnode.addClassName( data.hoverClassName );
-			data._listeners && data._listeners[ X.UI.Event.POINTER_IN ] && data.dispatch( e, X.UI.Event.POINTER_IN, true ); // new Event
+			data[ '_listeners' ] && data[ '_listeners' ][ X.UI.Event.POINTER_IN ] && data[ 'dispatch' ]( e, X.UI.Event.POINTER_IN, true ); // new Event
 			data.hovering = true;
 		};
 	};
-	delete X.UI.currentRootData._eventBusy;
-	return ret | X.Callback.PREVENT_DEFAULT;
+	X_UI_eventBusy = false;
+	return ret | X_Callback_PREVENT_DEFAULT;
 };
 
 /*
@@ -67,7 +69,7 @@ X.UI._eventRellay = function( e ){
 
 X.UI._PageRoot = X.UI._Box.inherits(
 	'_PageRoot',
-	X.Class.FINAL | X.Class.PRIVATE_DATA | X.Class.SUPER_ACCESS,
+	X_Class.FINAL | X_Class.PRIVATE_DATA | X_Class.SUPER_ACCESS,
 	{
 		layout                : X.UI.Layout.Canvas,
 		
@@ -80,26 +82,24 @@ X.UI._PageRoot = X.UI._Box.inherits(
 		eventCounter          : null,
 		cursorStyle           : null,
 		
-		_eventBusy            : false,
-		
 		Constructor : function( layout, args ){
-			this.SuperConstructor( layout, args );
+			this[ 'Super' ]( layout, args );
 			
-			if( X_ViewPort_readyState === X.Event.XDOM_READY ){
-				X.Timer.once( 0, this, this.start );
+			if( X_ViewPort_readyState === X_EVENT_XDOM_READY ){
+				X_Timer_once( 0, this, this.start );
 			} else {
-				X.ViewPort.listenOnce( X.Event.XDOM_READY, this, this.start );
+				X.ViewPort[ 'listenOnce' ]( X_EVENT_XDOM_READY, this, this.start );
 			};
 			
 			this.hoverList    = [];
 			this.eventCounter = {};
 			
-			X.UI.currentRootData = this;
+			X_UI_rootData = this;
 		},
 		
 		start : function(){
 			this.initialize( this.User, this, null, null );
-			X.Timer.once( 0, this, this.addToView );
+			X_Timer_once( 0, this, this.addToView );
 		},
 		addToView : function(){
 			var	counter = this.eventCounter, flg;
@@ -114,52 +114,47 @@ X.UI._PageRoot = X.UI._Box.inherits(
 			} );
 			
 			// hover や rollover rollout のための move イベントの追加
-			// mouseout, mouseover
-			//if( X_UA_HID.POINTER ){
-				this.xnodeInteractiveLayer.listen( X.UI.Event.IdToName[ X.UI.Event._POINTER_MOVE ], X.UI._eventRellay );
-				if( counter[ X.UI.Event._POINTER_MOVE ] ){
-					++counter[ X.UI.Event._POINTER_MOVE ];
-				} else {
-					counter[ X.UI.Event._POINTER_MOVE ] = 1;
-				};
-			/*} else {
-				this.xnodeInteractiveLayer.listen( X.UI.Event.IdToName[ X.UI.Event._MOUSE_MOVE ], X.UI._eventRellay );
-				if( counter[ X.UI.Event._MOUSE_MOVE ] ){
-					++counter[ X.UI.Event._MOUSE_MOVE ];
-				} else {
-					counter[ X.UI.Event._MOUSE_MOVE ] = 1;
-				};
-			};*/
-			X.Timer.once( 0, this, this.afterAddToView );
+			this.xnodeInteractiveLayer[ 'listen' ]( 'pointermove', X_UI_eventRellay );
+			if( counter[ X.UI.Event._POINTER_MOVE ] ){
+				++counter[ X.UI.Event._POINTER_MOVE ];
+			} else {
+				counter[ X.UI.Event._POINTER_MOVE ] = 1;
+			};
+
+			X_Timer_once( 0, this, this.afterAddToView );
 		},
 		afterAddToView : function(){
-			this.xnode.className( 'PageRoot' );
+			this.xnode[ 'className' ]( 'PageRoot' );
 			
 			this.creationComplete();
-			X.Timer.once( 0, this, this.doFirstCalc );
+			X_Timer_once( 0, this, this.doFirstCalc );
 		},
 		
 		doFirstCalc : function(){
 			this.calculate();
 			this.phase = 4;
 			X.ViewPort
-				.listen( X.Event.VIEW_RESIZED, this, this.calculate )
-				.listen( X.Event.BASE_FONT_RESIZED, this, this.calculate );
+				[ 'listen' ]( X_EVENT_VIEW_RESIZED, this, this.calculate )
+				[ 'listen' ]( X_EVENT_BASE_FONT_RESIZED, this, this.calculate );
 		},
 		
 		reserveCalc : function(){
 			if( this.calcReserved === false ){
 				this.calcReserved = true;
-				X.Timer.once( 0, this, this.calculate );
+				X_Timer_once( 0, this, this.calculate );
 			};
 		},
 		calculate : function( e ){
-			var size = X.ViewPort.getSize(),
-				font = X.ViewPort.getBaseFontSize(),
-				w    = size[ 0 ],
-				h    = size[ 1 ];
-			this.layout.calculate( this, false, 0, 0, w / font, h / font );
+			var size, font, w, h;
+			
+			this[ 'dispatch' ]( X.UI.Event.LAYOUT_BEFORE );
+			
+			size = X[ 'ViewPort' ][ 'getSize' ]();
+			font = X[ 'ViewPort' ][ 'getBaseFontSize' ]();
+			this.layout.calculate( this, false, 0, 0, size[ 0 ] / font, size[ 1 ] / font );
 			this.calcReserved = false;
+			
+			X_ViewPort[ 'listenOnce' ]( X_EVENT_AFTER_UPDATE, this, XUI_PageRoot_onViewUpdate );
 		},
 		
 		updateCoursor : function( cursor ){
@@ -167,12 +162,16 @@ X.UI._PageRoot = X.UI._Box.inherits(
 		},
 		
 		_remove : function(){
-			this.xnodeInteractiveLayer.unlisten();
+			X_EventDispatcher_unlistenAll( this.xnodeInteractiveLayer );
 			_Box.prototype._remove.call( this );
 		}
 	}
 );
 
+function XUI_PageRoot_onViewUpdate( e ){
+	this[ 'dispatch' ]( X.UI.Event.LAYOUT_COMPLETE );
+};
+
 X.UI.PageRoot = X.UI.Box.presets(
 	'PageRoot',
 	X.UI._PageRoot,