X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F02_dom%2F03_XDomEvent.js;h=7759a95c1964a31c05db321200efd9c50a7c7110;hb=HEAD;hp=391cdb9667a891f2a009ae13ca72454e6281acd3;hpb=475df4df9670f042764a99c80d7716e994d28033;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/02_dom/03_XDomEvent.js b/0.6.x/js/02_dom/03_XDomEvent.js
index 391cdb9..7759a95 100644
--- a/0.6.x/js/02_dom/03_XDomEvent.js
+++ b/0.6.x/js/02_dom/03_XDomEvent.js
@@ -11,24 +11,38 @@
  */
 
 // http://msdn.microsoft.com/ja-jp/library/ie/dn255104%28v=vs.85%29.aspx
-var X_Dom_Event_devicePixelRatio = window.devicePixelRatio || ( window.screen.deviceXDPI / window.screen.logicalXDPI ),
-	X_Dom_Event_convertMSPointerType = window.MSPointerEvent && [ 0, 0, 'touch', 'pen', 'mouse' ],/*{
+var X_Dom_Event_devicePixelRatio = window.devicePixelRatio || ( window.screen.deviceXDPI / window.screen.logicalXDPI ) || 1,
+
+	X_Dom_Event_convertMSPointerType = ( !window.PointerEvent && window.MSPointerEvent ) && [ 0, 0, 'touch', 'pen', 'mouse' ], // WP8.1 は PointerEvent と MSPointerEvent 両方ある
+	/*{
 		'2' : 'touch',
 		'3' : 'pen',
 		'4' : 'mouse'
 	}; */
+	/*
+	 * https://github.com/markleusink/ios-html5-drag-drop-shim/blob/master/ios-drag-drop.js
+	 */
+	X_Dom_Event_coordinateSystemForElementFromPoint = X_UA[ 'iOS' ] < 5 ? 'page' : 'client', // iOS4 以下は clientX が undeifned...
+	
 	X_Dom_Event_CANCEL_MOUSE = {},
 	X_DomEvent;
 
+if( X_Dom_Event_devicePixelRatio !== 1 ){
+	X_UA_classNameForHTML += ' dpr' + X_Dom_Event_devicePixelRatio;
+	
+	X_UA[ 'dpr' ] = X_Dom_Event_devicePixelRatio;	
+};
+
 if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
 	X_DomEvent = function( e, xnode ){
 		var originalType = e.type,
+			isNum = X_Type_isNumber,
 			type, pointerEventType,
 			touches, events,
-			altKey, ctrlKey, metaKey, shiftKey, target, related, force,
+			altKey, ctrlKey, metaKey, shiftKey, target, xtarget, offset, related, force,
 			elm, i, n, time, touch, ev;
 		
-		//this._event        = e;
+		this._e        = e;
 		this[ 'type' ]          = type = X_Event_RenameTo[ originalType ] || originalType;
 		
 		switch( type ){
@@ -55,14 +69,16 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
 		//console.log( 'original : ' + originalType + ' > ' + type );
 		// http://msdn.microsoft.com/ja-jp/library/ie/dn304886%28v=vs.85%29.aspx
 		// ポインター イベントの更新
-		if( e.pointerType ){
+		if( e.pointerType ||
+			// IE11 の IE10 モードで click イベントの pointerType が undefined
+			( X_UA[ 'IE' ] === 10 && type === 'click' && ( e.pointerType = 'mouse' ) ) ){
 			// PointerEvent;
 			if( X_Dom_Event_convertMSPointerType ){
 				this[ 'pointerType' ]   = X_Dom_Event_convertMSPointerType[ e.pointerType ];
-				this[ 'pressure' ]      = e.pressure || ( e.button !== -1 ? 0.5 : 0 );
+				this[ 'pressure' ]      = isNum( e.pressure ) ? e.pressure : ( e.button !== -1 ? 0.5 : 0 );
 				// ポインターの接触形状の スクリーン ピクセル単位の幅と高さ なので変換。(多分、、、)
 				this[ 'width' ]         = e.width  / X_Dom_Event_devicePixelRatio;
-				this[ 'height' ]        = e.height / X_Dom_Event_devicePixelRatio;			
+				this[ 'height' ]        = e.height / X_Dom_Event_devicePixelRatio;
 			} else {
 				this[ 'pointerType' ]   = e.pointerType;
 				this[ 'pressure' ]      = e.pressure;
@@ -131,11 +147,16 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
 				for( i = touches.length; i; ){
 					touch   = touches[ --i ];
 					target  = touch.target;
+					target  = target.nodeType === 3 ? target.parentNode : target;
+					xtarget = X_Node_getXNode( target );
+					// https://developer.mozilla.org/en/docs/Web/API/Element/getBoundingClientRect
+					// Android 2+, iOS4+
+					offset  = X_UA[ 'iOS' ] < 5 ? xtarget.offset() : target.getBoundingClientRect();
 					related = touch.relatedTarget;
 					events[ i ] = {
 						'type'          : pointerEventType,
 						'pointerType'   : 'touch',
-						'target'        : X_Node_getXNode( target.nodeType === 3 ? target.parentNode : target ),// defeat Safari bug // xnodetouch.target,
+						'target'        : xtarget,// defeat Safari bug // xnodetouch.target,
 						'currentTarget' : xnode,
 						'relatedTarget' : related && X_Node_getXNode( related.nodeType === 3 ? related.parentNode : related ), // xnode iOS3 には relatedTarget がない
 						'isPrimary'     : true,
@@ -150,12 +171,17 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
 						'pointerId'     : touch.identifier + 2, // iOS4 は 変換が必要！
 						//screenX       : touch.screenX,
 						//screenY       : touch.screenY,
-						'clientX'       : touch.clientX || ( touch.pageX - X_ViewPort_scrollX ), // iOS4以下は clientX が undefined, コードでは入れ子のスクロールに対応できない
-						'clientY'       : touch.clientY || ( touch.pageY - X_ViewPort_scrollY ),
 						'pageX'         : touch.pageX,
-						'pageY'         : touch.pageY,
-						'offsetX'       : touch.offsetX, // 要素上の座標を取得 
-						'offsetY'       : touch.offsetY,
+						'pageY'         : touch.pageY,						
+						// iOS4 以下では clientX が undef, pageX から scrollLeft を引く.
+						// TODO getter にする?
+						'clientX'       : isNum( touch.clientX ) ? touch.clientX : ( touch.pageX - X_ViewPort_scrollX ),
+						'clientY'       : isNum( touch.clientY ) ? touch.clientY : ( touch.pageY - X_ViewPort_scrollY ),
+						// 要素上の座標を取得
+						// iOS8 でも offsetX が undef, iOS4　以下では pageX - offset.x, iOS5 以上は clientX - getBCR.left
+						// TODO getter にする?
+						'offsetX'       : isNum( touch.offsetX ) ? touch.offsetX : touch[ X_Dom_Event_coordinateSystemForElementFromPoint + 'X' ] - ( offset.x || offset.left || 0 ), 
+						'offsetY'       : isNum( touch.offsetY ) ? touch.offsetY : touch[ X_Dom_Event_coordinateSystemForElementFromPoint + 'Y' ] - ( offset.y || offset.top  || 0 ),
 						'radiusX'       : touch.radiusX || 0,
 						'radiusY'       : touch.radiusY || 0,
 						'rotationAngle' : touch.rotationAngle || 0,
@@ -163,7 +189,8 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
 						'width'         : touch.width || 0,
 						'height'        : touch.height || 0
 					};
-					console.log( 'e.pointerId = ' + touch.identifier );
+					//console.log( 'e.pointerId = ' + touch.identifier );
+					//X_UA[ 'iOS' ] < 5 && console.log( pointerEventType + ':[' + events[ i ].pageX + ',' + events[ i ].pageY + ']' + events[ i ].pointerId );
 				};
 				return events.length === 1 ? events[ 0 ] : events;
 			} else {
@@ -177,15 +204,14 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
 				this[ 'type' ]          = pointerEventType;
 				this[ 'pointerType' ]   = 'mouse';
 				
-				this[ 'button' ]        = e.button !== undefined ? e.button :
-									 e.which !== undefined ? e.which - 1 : -1;
+				this[ 'button' ]        = e.button !== undefined ? e.button : e.which !== undefined ? e.which - 1 : -1;
 				this[ 'buttons' ]       = e.buttons !== undefined ? e.buttons : this[ 'button' ] === 0 ? 1 : this[ 'button' ] === 1 ? 2 : this[ 'button' ] === 2 ? 4 : 0;
 				this[ 'pressure' ]      = ( this[ 'button' ] !== -1 ? 0.5 : 0 );
 				
 				elm = e.target;
 				this[ 'target' ]        = X_Node_getXNode( elm.nodeType === 3 ? elm.parentNode : elm );// defeat Safari bug // xnodetouch.target;
 				this[ 'isPrimary' ]     = true;
-				this[ 'hwTimestamp' ]   = this[ 'timestamp' ] = X_Timer_now(); 
+				this[ 'hwTimestamp' ]   = this[ 'timestamp' ] = X_Timer_now();
 				this[ 'altKey' ]        = e.altKey;
 				this[ 'ctrlKey' ]       = e.ctrlKey;
 				this[ 'metaKey' ]       = e.metaKey;
@@ -199,8 +225,8 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
 				this[ 'clientY' ]       = e.clientY;
 				this[ 'pageX' ]         = e.pageX;
 				this[ 'pageY' ]         = e.pageY;
-				this[ 'offsetX' ]       = e.offsetX || e.layerX; // 要素上の座標を取得 
-				this[ 'offsetY' ]       = e.offsetY || e.layerY;
+				this[ 'offsetX' ]       = isNum( e.offsetX ) ? e.offsetX : e.layerX; // 要素上の座標を取得 
+				this[ 'offsetY' ]       = isNum( e.offsetY ) ? e.offsetY : e.layerY;
 				
 			// http://www.programming-magic.com/20090127231544/
 			// Opera で button==2の場合、コンテキストメニューイベントを発火 「ツール」->「設定」->「詳細設定」->「コンテンツ」->「Javascriptオプション」で「右クリックを制御するスクリプトを許可する」
@@ -273,14 +299,14 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
 		if( this[ 'target' ] && !this[ 'target' ][ '_tag' ] ) this[ 'target' ] = this[ 'target' ].parent; // ie4 の fake Textnode がヒットしていないか？
 		this[ 'currentTarget' ] = xnode; // xnode
 		this[ 'relatedTarget' ] = X_Node_getXNode( e.formElement || e.toElement ); // xnode
-		this[ 'relatedTarget' ] && console.dir( 'relatide...' );
+		//this[ 'relatedTarget' ] && console.dir( 'relatide...' );
 		this[ 'eventPhase' ]    = e.srcElement === element ? 2: 3;
 		
 		this[ 'keyCode' ]       = e.keyCode;
 		this[ 'charCode' ]      = e.keyCode;
 		this[ 'altKey' ]        = e.altKey;
 		this[ 'ctrlKey' ]       = e.ctrlKey;
-		this[ 'shiftKey' ]      = e.shiftKey;		
+		this[ 'shiftKey' ]      = e.shiftKey;
 
 		
 		switch( this[ 'type' ] ){
@@ -320,6 +346,7 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
 	
 		if( type = X_Event_toPointer[ originalType ] ){
 			this[ 'type' ]          = type;
+			this[ 'pointerType' ]   = 'mouse';
 			this[ 'clientX' ]       = e.clientX;
 			this[ 'clientY' ]       = e.clientY;
 			//this[ 'screenX' ]       = e.screenX;
@@ -341,7 +368,9 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
 			//	this[ 'offsetX' ]       = e.x - e.srcElement.offsetLeft; // e.x はイベント発生要素の親要素を基準にした座標。
 			//	this[ 'offsetY' ]       = e.y - e.srcElement.offsetTop;	
 			//};
-			
+			this[ 'pressure' ]      = ( this[ 'button' ] !== -1 ? 0.5 : 0 );
+			this[ 'isPrimary' ]     = true;
+			this[ 'hwTimestamp' ]   = this[ 'timestamp' ] = X_Timer_now();
 			this[ 'pointerId' ]     = 1;
 			this[ 'radiusX' ]       = 0;
 			this[ 'radiusY' ]       = 0;
@@ -434,6 +463,8 @@ if( !navigator.pointerEnabled ){
 		X_Event_Rename[ 'pointerup'       ] = 'MSPointerUp';
 		X_Event_Rename[ 'pointermove'     ] = [ 'MSPointerMove', 'MSPointerHover' ];// ie10 と ie11 でペンのhoverevent の値が異なる
 		X_Event_Rename[ 'pointercancel'   ] = 'MSPointerCancel';
+		X_Event_Rename[ 'pointerout'      ] = 'MSPointerOut';
+		X_Event_Rename[ 'pointerleave'    ] = 'MSPointerLeave';
 		// http://msdn.microsoft.com/ja-jp/library/ie/dn304886%28v=vs.85%29.aspx
 	} else
 	if( X_UA_HID.TOUCH ){
@@ -442,12 +473,16 @@ if( !navigator.pointerEnabled ){
 		X_Event_Rename[ 'pointerup'       ] = [ 'touchend',   'mouseup' ];
 		X_Event_Rename[ 'pointermove'     ] = [ 'touchmove',  'mousemove' ];
 		X_Event_Rename[ 'pointercancel'   ] = 'touchcancel';
+		//X_Event_Rename[ 'pointerout'      ] = 
+		X_Event_Rename[ 'pointerleave'    ] = 'touchleave';
 		// X_Event_Rename[ 'click'           ] = [ 'touchstart', 'touchmove', 'touchend' ]; // ループになってしまう!直した!直ってない！
 	} else {
 		X_Event_Rename[ 'pointerdown'     ] = 'mousedown';
 		X_Event_Rename[ 'pointerup'       ] = 'mouseup';
 		X_Event_Rename[ 'pointermove'     ] = 'mousemove';
-		X_Event_Rename[ 'pointercancel'   ] = document.documentElement.onmouseleave !== undefined ? 'mouseleave' : 'mouseout';//??
+		//X_Event_Rename[ 'pointercancel'   ] = 
+		//X_Event_Rename[ 'pointerout'      ] = 
+		X_Event_Rename[ 'pointerleave'    ] = X_elmHtml.onmouseleave !== undefined ? 'mouseleave' : 'mouseout';
 		
 		// Opera は ブラウザ設定から右クリックの通知を許可すると mousedown で e.button==2 が返る,ｷｬﾝｾﾙは可能??
 		X_UA[ 'Opera' ] && ( X_Event_Rename[ 'contextmenu' ] = 'mousedown' );