Version 0.6.71, fix mousewheel & clientSize, & X.Timer.requestFrame.

[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 7c25930..f479338 100644 (file)
--- a/0.6.x/js/01_dom/12_XDomEvent.js
+++ b/0.6.x/js/01_dom/12_XDomEvent.js
@@ -46,17 +46,23 @@ if( !X.UA.IE || 9 <= X.UA.IE ){
                // axis\r
                // https://w3g.jp/blog/tools/wheelevent_crossbrowser\r
                // ホイール系イベント2014年版クロスブラウザ\r
+               if( e.deltaY ){\r
+                       this.deltaX = e.deltaX;\r
+                       this.deltaY = e.deltaY;\r
+               } else\r
                if( e.wheelDeltaY !== undefined ){\r
-                       this.wheelDeltaX = e.wheelDeltaX / 12;\r
-                       this.wheelDeltaY = e.wheelDeltaY / 12;\r
+                       this.deltaX = e.wheelDeltaX / 120;\r
+                       this.deltaY = e.wheelDeltaY / 120;\r
                } else\r
                if( e.wheelDelta !== undefined ){\r
-                       this.wheelDeltaX = this.wheelDeltaY = e.wheelDelta / 12;\r
+                       this.deltaX = 0;\r
+                       this.deltaY = e.wheelDelta / 120;\r
                } else\r
                if( e.detail !== undefined ){\r
-                       this.wheelDeltaX = this.wheelDeltaY = - e.detail * 3;\r
+                       this.deltaX = 0;\r
+                       this.deltaY = e.type === 'MozMousePixelScroll' ? e.detail / 15 : e.detail; // 3\r
                } else {\r
-                       this.wheelDeltaX = this.wheelDeltaY = 0;\r
+                       this.deltaX = this.deltaY = 0;\r
                };\r
                \r
                if( /* e.constructor === window.TouchEvent || */ e.touches /* for iOS3.13 */ ){\r
@@ -156,7 +162,8 @@ if( !X.UA.IE || 9 <= X.UA.IE ){
                                        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
+               this.deltaX      = 0;\r
+               this.deltaY      = e.wheelDelta / 12;\r
        };\r
 };\r
 \r
@@ -197,21 +204,22 @@ X.Dom.Event.Rename = {};
 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( 'wheel <= MozMousePixelScroll' );\r
-               X.Dom.Event.Rename[ 'mousewheel' ] = 'MozMousePixelScroll';\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
+                       console.log( 'wheel <= MozMousePixelScroll' );\r
+                       X.Dom.Event.Rename[ 'wheel' ] = 'MozMousePixelScroll';\r
+               } else\r
+               if( 0.9 < X.UA.Gecko && 7 <= X.UA.GeckoPatch ){ // Gecko 0.9.7+ (NN6.2+?)\r
+                       console.log( 'wheel <= DOMMouseScroll' );\r
+                       X.Dom.Event.Rename[ 'wheel' ] = 'DOMMouseScroll';\r
+               };\r
        } else\r
-       if( 0.9 < X.UA.Gecko && 7 <= X.UA.GeckoPatch ){ // Gecko 0.9.7+ (NN6.2+?)\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
+       if( document.onmousewheel !== undefined ){\r
+               X.Dom.Event.Rename[ 'wheel' ] = 'mousewheel';\r
+       };      \r
 };\r
 \r
 if( window.onwebkitanimationend !== undefined && window.onanimationend === undefined ){\r