X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F01_dom%2F12_XDomEvent.js;fp=0.6.x%2Fjs%2F01_dom%2F12_XDomEvent.js;h=7c259300a27314e4f70c100f8a0998b83cf5cf18;hb=d3bd48b05c1f862dafaa3fb42a4ca155548b548e;hp=35a2f70d48e9db35dce7889519d57f293bf910ee;hpb=e5bd4c671159ce0d971476587246e5b4381a02a4;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/01_dom/12_XDomEvent.js b/0.6.x/js/01_dom/12_XDomEvent.js
index 35a2f70..7c25930 100644
--- a/0.6.x/js/01_dom/12_XDomEvent.js
+++ b/0.6.x/js/01_dom/12_XDomEvent.js
@@ -38,6 +38,7 @@ if( !X.UA.IE || 9 <= X.UA.IE ){
 		
 		// http://www.programming-magic.com/20090127231544/
 		this.which         = e.which || ( e.button + 1 ); // 左:1, 中:2, 右:3
+		this.button        = e.button;
 		
 		// https://developer.mozilla.org/ja/docs/DOM/DOM_event_reference/mousewheel
 		
@@ -154,6 +155,7 @@ if( !X.UA.IE || 9 <= X.UA.IE ){
 					btn & 4 ? 2 :
 					btn & 2 ? 3 : 0; // 左:1(click:0), 中:4, 右:2
 		};
+		this.button      = this.which - 1;
 		this.wheelDeltaX = this.wheelDeltaY = e.wheelDelta / 12;
 	};
 };
@@ -194,17 +196,22 @@ X.Dom.Event._LOAD_FIX_TAGS = {
 X.Dom.Event.Rename = {};
 X.Dom.Event.RenameTo = {};
 // https://github.com/georgeadamson/jQuery.prefixfree-events/blob/master/jQuery.prefixfree-events.js
+// https://developer.mozilla.org/en-US/docs/Web/Events/wheel
+// 
 
 // DOMMoseScroll
 if( X.UA.Gecko && window.MouseScrollEvent ){
 	if( 2 <= X.UA.Gecko || ( 1.9 < X.UA.Gecko && 1 <= X.UA.GeckoPatch ) ){ // Gecko 1.9.1+ (firefox3.5+)
-		console.log( 'mousewheel <= MozMousePixelScroll' );
+		console.log( 'wheel <= MozMousePixelScroll' );
 		X.Dom.Event.Rename[ 'mousewheel' ] = 'MozMousePixelScroll';
 	} else
 	if( 0.9 < X.UA.Gecko && 7 <= X.UA.GeckoPatch ){ // Gecko 0.9.7+ (NN6.2+?)
-		console.log( 'mousewheel <= DOMMouseScroll' );
-		X.Dom.Event.Rename[ 'mousewheel' ] = 'DOMMouseScroll';
+		console.log( 'wheel <= DOMMouseScroll' );
+		X.Dom.Event.Rename[ 'wheel' ] = 'DOMMouseScroll';
 	};
+} else
+if( document.onmousewheel !== undefined ){
+	X.Dom.Event.Rename[ 'wheel' ] = 'mousewheel';
 };
 
 if( window.onwebkitanimationend !== undefined && window.onanimationend === undefined ){