diff --git a/lib/OpenLayers/Control/MouseDefaults.js b/lib/OpenLayers/Control/MouseDefaults.js index 0efa38043b..78c075d213 100644 --- a/lib/OpenLayers/Control/MouseDefaults.js +++ b/lib/OpenLayers/Control/MouseDefaults.js @@ -327,7 +327,7 @@ OpenLayers.Control.MouseDefaults = OpenLayers.Class(OpenLayers.Control, { } if (e.wheelDelta) { delta = e.wheelDelta/120; - if (window.opera) { + if (window.opera && window.opera.version() < 9.2) { delta = -delta; } } else if (e.detail) { diff --git a/lib/OpenLayers/Handler/MouseWheel.js b/lib/OpenLayers/Handler/MouseWheel.js index 29753407f8..060022a7ec 100644 --- a/lib/OpenLayers/Handler/MouseWheel.js +++ b/lib/OpenLayers/Handler/MouseWheel.js @@ -88,7 +88,7 @@ OpenLayers.Handler.MouseWheel = OpenLayers.Class(OpenLayers.Handler, { } if (e.wheelDelta) { delta = e.wheelDelta/120; - if (window.opera) { + if (window.opera && window.opera.version() < 9.2) { delta = -delta; } } else if (e.detail) { diff --git a/tests/Handler/test_MouseWheel.html b/tests/Handler/test_MouseWheel.html index be5187f7f0..55110da60d 100644 --- a/tests/Handler/test_MouseWheel.html +++ b/tests/Handler/test_MouseWheel.html @@ -56,7 +56,7 @@ handler.setMap(map); handler.activate(); var delta = 120; - if (window.opera) delta = -delta; + if (window.opera && window.opera.version() < 9.2) delta = -delta; handler.onWheelEvent({'target':map.div, wheelDelta: delta}); t.ok(pass, "evt.xy was set even without a mouse move"); }