if( !X_UA.IE || 9 <= X_UA.IE ){\r
X.Dom.Event = function( e, xnode ){\r
var originalType = e.type,\r
- type, pointerType,\r
+ type, pointerEventType,\r
touches, events,\r
- altKey, ctrlKey, metaKey, shiftKey, target, related,\r
+ altKey, ctrlKey, metaKey, shiftKey, target, related, force,\r
elm, i, n, time, touch, ev;\r
\r
//this._event = e;\r
this.type = type = X_Event_RenameTo[ originalType ] || originalType;\r
\r
- console.log( 'original : ' + originalType + ' > ' + type );\r
+ switch( type ){\r
+ case 'message' :\r
+ this.data = e.data;\r
+ this.origin = e.origin;\r
+ this.source = e.source;\r
+ break;\r
+ case 'progress' :\r
+ this.lengthComputable = e.lengthComputable;\r
+ this.loaded = e.loaded;\r
+ this.total = e.total;\r
+ break;\r
+ };\r
+ \r
+ //console.log( 'original : ' + originalType + ' > ' + type );\r
// http://msdn.microsoft.com/ja-jp/library/ie/dn304886%28v=vs.85%29.aspx\r
// ポインター イベントの更新\r
if( e.pointerType ){\r
this.offsetX = e.offsetX;\r
this.offsetY = e.offsetY;\r
} else\r
- if( pointerType = X_Event_toPointer[ originalType ] ){\r
+ if( pointerEventType = X_Event_toPointer[ originalType ] ){\r
// Touch or Mouse\r
+ //console.log( originalType + ' => ' + pointerEventType );\r
\r
/* e.constructor === window.TouchEvent -> e.touches for iOS3.13 */\r
if( touches = e.changedTouches ){\r
+ //console.log( originalType + ' => ' + pointerEventType );\r
if( touches.length === 0 ){\r
alert( 'e.changedTouches.length === 0' );\r
};\r
- xnode._cancelMouse = pointerType;\r
+ xnode._cancelMouse = pointerEventType;\r
\r
events = [];\r
altKey = e.altKey;\r
metaKey = e.metaKey;\r
shiftKey = e.shiftKey;\r
time = X_Timer_now();\r
+ force = originalType === 'touchend' || originalType === 'touchcancel' ? 0 : 0.5;\r
for( i = touches.length; i; ){\r
touch = touches[ --i ];\r
target = touch.target;\r
related = touch.relatedTarget;\r
events[ i ] = {\r
- type : pointerType,\r
+ type : pointerEventType,\r
pointerType : 'touch',\r
target : X_Node_getXNode( target.nodeType === 3 ? target.parentNode : target ),// defeat Safari bug // xnodetouch.target,\r
currentTarget : xnode,\r
- relatedTarget : X_Node_getXNode( related.nodeType === 3 ? related.parentNode : related ), // xnode\r
+ relatedTarget : related && X_Node_getXNode( related.nodeType === 3 ? related.parentNode : related ), // xnode iOS3 には relatedTarget がない\r
isPrimary : true,\r
hwTimestamp : time,\r
timestamp : time,\r
- buttons : e.button,\r
+ button : e.button,\r
buttons : e.buttons || e.button,\r
altKey : altKey,\r
ctrlKey : ctrlKey,\r
radiusX : touch.radiusX || 0,\r
radiusY : touch.radiusY || 0,\r
rotationAngle : touch.rotationAngle || 0,\r
- pressure : touch.force || touch.webkitForce || ( isEnd ? 0 : 0.5 ),\r
+ pressure : touch.force || touch.webkitForce || force,\r
width : touch.width || 0,\r
height : touch.height || 0\r
};\r
return events.length === 1 ? events[ 0 ] : events;\r
} else {\r
\r
- if( xnode._cancelMouse === pointerType ){\r
+ if( xnode._cancelMouse === pointerEventType ){\r
delete xnode._cancelMouse;\r
console.log( '**** xnode._cancelMouse ' + xnode._cancelMouse );\r
return [];\r
};\r
\r
// MouseEvent;\r
- this.type = type;\r
+ this.type = pointerEventType;\r
this.pointerType = 'mouse';\r
\r
this.button = e.button !== undefined ? e.button :\r
if( e.deltaY !== undefined ){\r
this.deltaX = e.deltaX;\r
this.deltaY = e.deltaY;\r
- this.deltaZ = e.deltaZ;\r
+ this.deltaZ = e.deltaZ || 0;\r
} else\r
if( e.wheelDeltaY !== undefined ){\r
this.deltaX = e.wheelDeltaX / 120;\r
\r
this.type = X_Event_RenameTo[ originalType ] || originalType;\r
this.target = X_Node_getXNode( e.srcElement ); // xnode\r
- if( this.target && this.target._xnodeType === 3 ) this.target = this.target.parent; // ie4 の fake Textnode がヒットしていないか？\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.eventPhase = e.srcElement === element ? 2: 3;\r
this.ctrlKey = e.ctrlKey;\r
this.shiftKey = e.shiftKey; \r
\r
+ \r
+ switch( this.type ){\r
+ case 'message' :\r
+ this.data = e.data;\r
+ this.origin = e.origin;\r
+ this.source = e.source;\r
+ break;\r
+ case 'progress' :\r
+ this.loaded = e.loaded;\r
+ this.total = e.total;\r
+ break;\r
+ };\r
+\r
// http://www.programming-magic.com/20090127231544/\r
switch( originalType ){\r
case 'click' :\r
};\r
};\r
\r
-X.Dom.Event.ANIME_BEFORE_START = ++X_Event_last;\r
-X.Dom.Event.ANIME_START = ++X_Event_last;\r
-X.Dom.Event.ANIME = ++X_Event_last;\r
-X.Dom.Event.ANIME_END = ++X_Event_last;\r
-X.Dom.Event.ANIME_BEFORE_STOP = ++X_Event_last; // xnode.stop() のみ、指定時間による停止では呼ばれない\r
-X.Dom.Event.ANIME_STOP = ++X_Event_last;\r
-\r
-\r
// TODO load -> readystatechange this.readyState === "loaded" || this.readyState === "complete"\r
/*\r
X.Dom.Event._LOAD_FIX_TAGS = {\r
} else\r
if( X_UA_HID.TOUCH ){\r
// touch のみ(iOS でも脱獄したら?)、 touch と mouse(Android), mouse のみ\r
- X_Event_Rename[ 'pointerdown' ] = [ 'touchdown', 'mousedown' ];\r
- X_Event_Rename[ 'pointerup' ] = [ 'touchup', 'mouseup' ];\r
- X_Event_Rename[ 'pointermove' ] = [ 'touchmove', 'mousemove' ];\r
+ X_Event_Rename[ 'pointerdown' ] = [ 'touchstart', 'mousedown' ];\r
+ X_Event_Rename[ 'pointerup' ] = [ 'touchend', 'mouseup' ];\r
+ X_Event_Rename[ 'pointermove' ] = [ 'touchmove', 'mousemove' ];\r
X_Event_Rename[ 'pointercancel' ] = 'touchcancel';\r
- // X_Event_Rename[ 'click' ] = [ 'touchdown', 'touchmove', 'touchup' ]; // ループになってしまう!直した!直ってない！\r
+ // X_Event_Rename[ 'click' ] = [ 'touchstart', 'touchmove', 'touchend' ]; // ループになってしまう!直した!直ってない！\r
} else {\r
X_Event_Rename[ 'pointerdown' ] = 'mousedown';\r
X_Event_Rename[ 'pointerup' ] = 'mouseup';\r
OSDN Git Service
