-/**\r
+/*\r
* use X.Callback\r
* \r
* http://d.hatena.ne.jp/uupaa/20100430/1272561922\r
*/\r
\r
// http://msdn.microsoft.com/ja-jp/library/ie/dn255104%28v=vs.85%29.aspx\r
-var X_Dom_Event_devicePixelRatio = window.devicePixelRatio || ( window.screen.deviceXDPI / window.screen.logicalXDPI ),\r
- X_Dom_Event_convertMSPointerType = window.MSPointerEvent && [ 0, 0, 'touch', 'pen', 'mouse' ],/*{\r
+var X_Dom_Event_devicePixelRatio = window.devicePixelRatio || ( window.screen.deviceXDPI / window.screen.logicalXDPI ) || 1,\r
+\r
+ X_Dom_Event_convertMSPointerType = ( !window.PointerEvent && window.MSPointerEvent ) && [ 0, 0, 'touch', 'pen', 'mouse' ], // WP8.1 は PointerEvent と MSPointerEvent 両方ある\r
+ /*{\r
'2' : 'touch',\r
'3' : 'pen',\r
'4' : 'mouse'\r
X_Dom_Event_CANCEL_MOUSE = {},\r
X_DomEvent;\r
\r
+if( X_Dom_Event_devicePixelRatio !== 1 ){\r
+ X_UA_classNameForHTML += ' dpr' + X_Dom_Event_devicePixelRatio;\r
+ \r
+ X_UA[ 'dpr' ] = X_Dom_Event_devicePixelRatio; \r
+};\r
+\r
if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){\r
X_DomEvent = function( e, xnode ){\r
var originalType = e.type,\r
this[ 'loaded' ] = e.loaded;\r
this[ 'total' ] = e.total;\r
break;\r
+ case 'dragstart' :\r
+ case 'dragenter' :\r
+ case 'dragover' :\r
+ case 'dragleave' :\r
+ case 'drop' :\r
+ case 'dragend' :\r
+ this[ 'dataTransfer' ] = e.dataTransfer;\r
+ break;\r
};\r
\r
//console.log( 'original : ' + originalType + ' > ' + type );\r
this[ 'pressure' ] = e.pressure || ( e.button !== -1 ? 0.5 : 0 );\r
// ポインターの接触形状の スクリーン ピクセル単位の幅と高さ なので変換。(多分、、、)\r
this[ 'width' ] = e.width / X_Dom_Event_devicePixelRatio;\r
- this[ 'height' ] = e.height / X_Dom_Event_devicePixelRatio; \r
+ this[ 'height' ] = e.height / X_Dom_Event_devicePixelRatio;\r
} else {\r
this[ 'pointerType' ] = e.pointerType;\r
this[ 'pressure' ] = e.pressure;\r
'isPrimary' : true,\r
'hwTimestamp' : time,\r
'timestamp' : time,\r
- 'button' : e.button,\r
- 'buttons' : e.buttons || e.button,\r
+ 'button' : /*e.button ||*/ ( force ? 0 : -1 ),\r
+ 'buttons' : /*e.buttons || e.button ||*/ ( force ? 1 : 0 ),\r
'altKey' : altKey,\r
'ctrlKey' : ctrlKey,\r
'metaKey' : metaKey,\r
'shiftKey' : shiftKey,\r
- 'pointerId' : touch.identifier + 2,\r
+ 'pointerId' : touch.identifier + 2, // iOS4 は 変換が必要!\r
//screenX : touch.screenX,\r
//screenY : touch.screenY,\r
- 'clientX' : touch.clientX,\r
- 'clientY' : touch.clientY,\r
+ 'clientX' : touch.clientX || ( touch.pageX - X_ViewPort_scrollX ), // iOS4以下は clientX が undefined, コードでは入れ子のスクロールに対応できない\r
+ 'clientY' : touch.clientY || ( touch.pageY - X_ViewPort_scrollY ),\r
'pageX' : touch.pageX,\r
'pageY' : touch.pageY,\r
'offsetX' : touch.offsetX, // 要素上の座標を取得 \r
'width' : touch.width || 0,\r
'height' : touch.height || 0\r
};\r
+ console.log( 'e.pointerId = ' + touch.identifier );\r
};\r
return events.length === 1 ? events[ 0 ] : events;\r
} else {\r
// http://www.programming-magic.com/20090127231544/\r
// Opera で button==2の場合、コンテキストメニューイベントを発火 「ツール」->「設定」->「詳細設定」->「コンテンツ」->「Javascriptオプション」で「右クリックを制御するスクリプトを許可する」\r
if( originalType === 'mousedown' && this[ 'button' ] === 2 && X_UA[ 'Opera' ] ){\r
- events = [ X_Object_clone( this ), X_Object_clone( this ) ];\r
+ events = [ X_Object_copy( this ), X_Object_copy( this ) ];\r
events[ 1 ].type = 'contextmenu';\r
return events;\r
};\r
} else {\r
// Other\r
\r
- this[ 'keyCode' ] = e.keyCode || e.which;\r
- this[ 'altKey' ] = e.altKey;\r
- this[ 'ctrlKey' ] = e.ctrlKey;\r
- this[ 'shiftKey' ] = e.shiftKey;\r
- this[ 'metaKey' ] = e.metaKey;\r
+ this[ 'keyCode' ] = X_Type_isFinite( e.keyCode ) ? e.keyCode : X_Type_isFinite( e.charCode ) ? e.charCode : e.which;\r
+ this[ 'charCode' ] = X_Type_isFinite( e.charCode ) ? e.charCode : e.which;\r
+ this[ 'altKey' ] = e.altKey || !!( e.modifiers & 1 );\r
+ this[ 'ctrlKey' ] = e.ctrlKey || !!( e.modifiers & 2 );\r
+ this[ 'shiftKey' ] = e.shiftKey || !!( e.modifiers & 4 );\r
+ this[ 'metaKey' ] = e.metaKey || !!( e.modifiers & 8 );;\r
\r
this[ 'button' ] = e.button !== undefined ? e.button :\r
e.which !== undefined ? e.which - 1 : -1;\r
if( this[ 'target' ] && !this[ 'target' ][ '_tag' ] ) this[ 'target' ] = this[ 'target' ].parent; // ie4 の fake Textnode がヒットしていないか?\r
this[ 'currentTarget' ] = xnode; // xnode\r
this[ 'relatedTarget' ] = X_Node_getXNode( e.formElement || e.toElement ); // xnode\r
+ this[ 'relatedTarget' ] && console.dir( 'relatide...' );\r
this[ 'eventPhase' ] = e.srcElement === element ? 2: 3;\r
\r
this[ 'keyCode' ] = e.keyCode;\r
+ this[ 'charCode' ] = e.keyCode;\r
this[ 'altKey' ] = e.altKey;\r
this[ 'ctrlKey' ] = e.ctrlKey;\r
this[ 'shiftKey' ] = e.shiftKey; \r
\r
if( type = X_Event_toPointer[ originalType ] ){\r
this[ 'type' ] = type;\r
+ this[ 'pointerType' ] = 'mouse';\r
this[ 'clientX' ] = e.clientX;\r
this[ 'clientY' ] = e.clientY;\r
//this[ 'screenX' ] = e.screenX;\r
X_Event_Rename[ 'pointerup' ] = 'MSPointerUp';\r
X_Event_Rename[ 'pointermove' ] = [ 'MSPointerMove', 'MSPointerHover' ];// ie10 と ie11 でペンのhoverevent の値が異なる\r
X_Event_Rename[ 'pointercancel' ] = 'MSPointerCancel';\r
+ X_Event_Rename[ 'pointerout' ] = 'MSPointerOut';\r
+ X_Event_Rename[ 'pointerleave' ] = 'MSPointerLeave';\r
// http://msdn.microsoft.com/ja-jp/library/ie/dn304886%28v=vs.85%29.aspx\r
} else\r
if( X_UA_HID.TOUCH ){\r
X_Event_Rename[ 'pointerup' ] = [ 'touchend', 'mouseup' ];\r
X_Event_Rename[ 'pointermove' ] = [ 'touchmove', 'mousemove' ];\r
X_Event_Rename[ 'pointercancel' ] = 'touchcancel';\r
+ X_Event_Rename[ 'pointerout' ] = \r
+ X_Event_Rename[ 'pointerleave' ] = 'touchleave';\r
// X_Event_Rename[ 'click' ] = [ 'touchstart', 'touchmove', 'touchend' ]; // ループになってしまう!直した!直ってない!\r
} else {\r
X_Event_Rename[ 'pointerdown' ] = 'mousedown';\r
X_Event_Rename[ 'pointerup' ] = 'mouseup';\r
X_Event_Rename[ 'pointermove' ] = 'mousemove';\r
- X_Event_Rename[ 'pointercancel' ] = 'mouseleave';//??\r
+ X_Event_Rename[ 'pointercancel' ] = \r
+ X_Event_Rename[ 'pointerleave' ] = \r
+ X_Event_Rename[ 'pointerleave' ] = document.documentElement.onmouseleave !== undefined ? 'mouseleave' : 'mouseout';\r
\r
// Opera は ブラウザ設定から右クリックの通知を許可すると mousedown で e.button==2 が返る,キャンセルは可能??\r
- X_UA[ 'Opera' ] && (\r
- X_Event_Rename[ 'contextmenu' ] = 'mousedown' );\r
+ X_UA[ 'Opera' ] && ( X_Event_Rename[ 'contextmenu' ] = 'mousedown' );\r
\r
/*\r
* buttons の無いブラウザには mouseup, mousedown を監視して、buttons フラグを更新し続ける\r