X-Git-Url: http://git.osdn.jp/view?p=pettanr%2FclientJs.git;a=blobdiff_plain;f=0.6.x%2Fjs%2F02_dom%2F03_XDomEvent.js;fp=0.6.x%2Fjs%2F02_dom%2F03_XDomEvent.js;h=bc7abf086ff9755b15fa4abc53ee2bcb2a70133b;hp=7c94b060a6138254cf344b2254d6e94bb347fe4e;hb=bafa8683f87b2f909d1301fca80684bf9ff221ed;hpb=d3d95fb0bc2ab2f61c7f15746b2d64078ef39af8

diff --git a/0.6.x/js/02_dom/03_XDomEvent.js b/0.6.x/js/02_dom/03_XDomEvent.js
index 7c94b06..bc7abf0 100644
--- a/0.6.x/js/02_dom/03_XDomEvent.js
+++ b/0.6.x/js/02_dom/03_XDomEvent.js
@@ -19,6 +19,11 @@ var X_Dom_Event_devicePixelRatio = window.devicePixelRatio || ( window.screen.de
 		'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;
 
@@ -31,9 +36,10 @@ if( X_Dom_Event_devicePixelRatio !== 1 ){
 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;
@@ -63,11 +69,13 @@ 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;
@@ -139,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,
@@ -158,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,
@@ -172,6 +190,7 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
 						'height'        : touch.height || 0
 					};
 					//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 {
@@ -206,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オプション」で「右クリックを制御するスクリプトを許可する」