*/\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[ '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
} 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