Version 0.6.70, bugfix.

[pettanr/clientJs.git] / 0.6.x / js / 01_dom / 12_XDomEvent.js

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 (file)
--- 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 ){
                \r
                // http://www.programming-magic.com/20090127231544/\r
                this.which         = e.which || ( e.button + 1 ); // 左:1, 中:2, 右:3\r
+               this.button        = e.button;\r
                \r
                // https://developer.mozilla.org/ja/docs/DOM/DOM_event_reference/mousewheel\r
                \r
@@ -154,6 +155,7 @@ if( !X.UA.IE || 9 <= X.UA.IE ){
                                        btn & 4 ? 2 :\r
                                        btn & 2 ? 3 : 0; // 左:1(click:0), 中:4, 右:2\r
                };\r
+               this.button      = this.which - 1;\r
                this.wheelDeltaX = this.wheelDeltaY = e.wheelDelta / 12;\r
        };\r
 };\r
@@ -194,17 +196,22 @@ X.Dom.Event._LOAD_FIX_TAGS = {
 X.Dom.Event.Rename = {};\r
 X.Dom.Event.RenameTo = {};\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
 \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
-               console.log( 'mousewheel <= MozMousePixelScroll' );\r
+               console.log( 'wheel <= MozMousePixelScroll' );\r
                X.Dom.Event.Rename[ 'mousewheel' ] = 'MozMousePixelScroll';\r
        } else\r
        if( 0.9 < X.UA.Gecko && 7 <= X.UA.GeckoPatch ){ // Gecko 0.9.7+ (NN6.2+?)\r
-               console.log( 'mousewheel <= DOMMouseScroll' );\r
-               X.Dom.Event.Rename[ 'mousewheel' ] = 'DOMMouseScroll';\r
+               console.log( 'wheel <= DOMMouseScroll' );\r
+               X.Dom.Event.Rename[ 'wheel' ] = 'DOMMouseScroll';\r
        };\r
+} else\r
+if( document.onmousewheel !== undefined ){\r
+       X.Dom.Event.Rename[ 'wheel' ] = 'mousewheel';\r
 };\r
 \r
 if( window.onwebkitanimationend !== undefined && window.onanimationend === undefined ){\r