'4' : 'mouse'\r
}; */\r
\r
-if( !X.UA.IE || 9 <= X.UA.IE ){\r
+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
\r
// http://www.programming-magic.com/20090127231544/\r
// Opera で button==2の場合、コンテキストメニューイベントを発火 「ツール」->「設定」->「詳細設定」->「コンテンツ」->「Javascriptオプション」で「右クリックを制御するスクリプトを許可する」\r
- if( originalType === 'mousedown' && this.button === 2 && X.UA.Opera ){\r
+ if( originalType === 'mousedown' && this.button === 2 && X_UA[ 'Opera' ] ){\r
events = [ X.Object.clone( this ), X.Object.clone( this ) ];\r
events[ 1 ].type = 'contextmenu';\r
return events;\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
this.currentTarget = xnode; // xnode\r
this.eventPhase = e.eventPhase;\r
this.detail = e.detail;\r
- \r
};\r
} else {\r
X.Dom.Event = function( e, xnode, element ){\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
this.buttons = e.button;\r
\r
+ this.deltaX = 0;\r
+ this.deltaY = e.wheelDelta / -120; \r
+ \r
if( type = X_Event_toPointer[ originalType ] ){\r
this.type = type;\r
this.clientX = e.clientX;\r
//event.pageY = DOMAssistant.def(e.pageY)? e.pageY : (event.clientY + (de.scrollTop || b.scrollTop) - (de.clientTop || 0)); \r
//};\r
\r
- if( 5 <= X.UA.IE ){\r
+ if( 5 <= X_UA[ 'IE' ] ){\r
this.offsetX = e.offsetX; // イベントターゲット左上からの座標\r
this.offsetY = e.offsetY; \r
}// else\r
// this.offsetX = e.x - e.srcElement.offsetLeft; // e.x はイベント発生要素の親要素を基準にした座標。\r
// this.offsetY = e.y - e.srcElement.offsetTop; \r
//};\r
-\r
- this.deltaX = 0;\r
- this.deltaY = e.wheelDelta / -120;\r
\r
this.pointerId = 1;\r
this.radiusX = 0;\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
IFRAME : true,\r
SCRIPT : true//,\r
//LINK : true\r
-};\r
+}; */\r
\r
// https://github.com/georgeadamson/jQuery.prefixfree-events/blob/master/jQuery.prefixfree-events.js\r
// https://developer.mozilla.org/en-US/docs/Web/Events/wheel\r
//\r
if( document.onwheel === undefined ){\r
// DOMMoseScroll\r
- if( X.UA.Gecko && window.MouseScrollEvent ){\r
- if( 2 <= X.UA.Gecko || ( 1.9 <= X.UA.Gecko && 1 <= X.UA.GeckoPatch ) ){ // Gecko 1.9.1+ (firefox3.5+)\r
+ if( X_UA[ 'Gecko' ] && window.MouseScrollEvent ){\r
+ if( 2 <= X_UA[ 'Gecko' ] || ( 1.9 <= X_UA[ 'Gecko' ] && 1 <= X_UA[ 'GeckoPatch' ] ) ){ // Gecko 1.9.1+ (firefox3.5+)\r
console.log( 'wheel <= MozMousePixelScroll' );\r
X_Event_Rename[ 'wheel' ] = 'MozMousePixelScroll';\r
} else\r
- if( 1 <= X.UA.Gecko || ( 0.9 <= X.UA.Gecko && 7 <= X.UA.GeckoPatch ) ){ // Gecko 0.9.7+ (NN6.2+?)\r
+ if( 1 <= X_UA[ 'Gecko' ] || ( 0.9 <= X_UA[ 'Gecko' ] && 7 <= X_UA[ 'GeckoPatch' ] ) ){ // Gecko 0.9.7+ (NN6.2+?)\r
console.log( 'wheel <= DOMMouseScroll' );\r
X_Event_Rename[ 'wheel' ] = 'DOMMouseScroll';\r
};\r
X_Event_Rename[ 'transitionend' ] = 'webkitTransitionEnd';\r
} else\r
if( window.onotransitionend !== undefined && window.ontransitionend === undefined ){\r
- if( X.UA.Opera < 12 ){\r
- console.log( 'transitionend <= oTransitionEnd|ver.' + X.UA.Opera );\r
+ if( X_UA[ 'Opera' ] < 12 ){\r
+ console.log( 'transitionend <= oTransitionEnd|ver.' + X_UA[ 'Opera' ] );\r
X_Event_Rename[ 'transitionend' ] = 'oTransitionEnd';\r
} else {\r
- console.log( 'transitionend <= otransitionEnd|ver.' + X.UA.Opera );\r
+ console.log( 'transitionend <= otransitionEnd|ver.' + X_UA[ 'Opera' ] );\r
X_Event_Rename[ 'transitionend' ] = 'otransitionEnd';\r
};\r
} else\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[ 'pointerdown' ] = [ 'touchdown', 'mousedown' ];\r
- X_Event_Rename[ 'pointerup' ] = [ 'touchup', 'mouseup' ];\r
- X_Event_Rename[ 'pointermove' ] = [ 'touchmove', 'mousemove' ];\r
+ // touch のみ(iOS でも脱獄したら?)、 touch と mouse(Android), mouse のみ\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' ] = [ 'click', 'tap' ]; // ループになってしまう!直した!\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[ 'pointercancel' ] = 'mouseleave';//??\r
\r
// Opera は ブラウザ設定から右クリックの通知を許可すると mousedown で e.button==2 が返る,ｷｬﾝｾﾙは可能??\r
- X.UA.Opera && (\r
+ X_UA[ 'Opera' ] && (\r
X_Event_Rename[ 'contextmenu' ] = 'mousedown' );\r
+ \r
+ /*\r
+ * buttons の無いブラウザには mouseup, mousedown を監視して、buttons フラグを更新し続ける\r
+ */\r
};\r
};\r
-\r
-/* -----------------------------------------------\r
- * Document Ready\r
- * Dean Edwards/Matthias Miller/John Resig\r
- */\r
-\r
-// SafariでJavaScriptのデバッグをする方法\r
-// safari1.3 可\r
-// http://shimax.cocolog-nifty.com/search/2006/09/safarijavascrip_c54d.html\r
-\r
-/* for ie9+/Mozilla/Opera9 */\r
-if( X_UA_EVENT.W3C ){\r
- Node._document.listenOnce( 'DOMContentLoaded', X_TEMP.onDomContentLoaded );\r
-} else\r
-if( 6 <= X.UA.IE && X.inHead ){\r
- // if this script in Head\r
- document.write( "<script id=__ie_onload defer src=javascript:void(0)><\/script>" );\r
- X_TEMP._script = document.getElementById( "__ie_onload" );\r
- X_TEMP._script.onreadystatechange = function(){\r
- var s = X_TEMP._script;\r
- if( s && s.readyState === 'complete' ){\r
- s.onreadystatechange = X.emptyFunction;\r
- s.onreadystatechange = null;\r
- s.parentNode.removeChild( s );\r
- delete X_TEMP._script;\r
- X_TEMP.onDomContentLoaded && X_TEMP.onDomContentLoaded();\r
- };\r
- };\r
-};\r
-// Re: onLoad doesn't work with Safari?\r
-// http://lists.apple.com/archives/web-dev/2003/Oct/msg00036.html\r
-if( X.UA.WebKit || X.UA.Safari < 3 ){ // sniff\r
- X.Timer.add( 16, function(){\r
- if( !X_TEMP.onDomContentLoaded ) return X_Callback_UN_LISTEN;\r
- if( document.readyState === 'loaded' || document.readyState === 'complete' ) return X_TEMP.onDomContentLoaded();\r
- });\r
-};\r
-\r
-/* for other browsers */\r
-X.ViewPort.listenOnce( 'load', X_TEMP.onDomContentLoaded );\r
-\r
OSDN Git Service
