Removed analog wheel detection and simplified code
This commit is contained in:
@@ -55,12 +55,6 @@ OpenLayers.Handler.MouseWheel = OpenLayers.Class(OpenLayers.Handler, {
|
|||||||
*/
|
*/
|
||||||
cumulative: true,
|
cumulative: true,
|
||||||
|
|
||||||
/**
|
|
||||||
* Property: analogWheelPrecision
|
|
||||||
* {Integer} Adjust to get analog scroll wheel to feel right
|
|
||||||
*/
|
|
||||||
analogWheelPrecision: 360,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor: OpenLayers.Handler.MouseWheel
|
* Constructor: OpenLayers.Handler.MouseWheel
|
||||||
*
|
*
|
||||||
@@ -178,27 +172,15 @@ OpenLayers.Handler.MouseWheel = OpenLayers.Class(OpenLayers.Handler, {
|
|||||||
|
|
||||||
if (e.wheelDelta) {
|
if (e.wheelDelta) {
|
||||||
delta = e.wheelDelta;
|
delta = e.wheelDelta;
|
||||||
|
if (delta % 160 === 0) {
|
||||||
if (OpenLayers.BROWSER_NAME === "safari") {
|
// opera have steps of 160 instead of 120
|
||||||
// Safari has a value 10 times other browsers
|
delta = delta * 0.75;
|
||||||
delta = delta * 10;
|
|
||||||
} else if (window.opera && window.opera.version() < 9.2) {
|
|
||||||
delta = -delta;
|
|
||||||
}
|
|
||||||
|
|
||||||
var isAnalogScrollWheel = (delta % 40 !== 0 || Math.abs(delta) < 120);
|
|
||||||
|
|
||||||
if (isAnalogScrollWheel) {
|
|
||||||
delta = delta / this.analogWheelPrecision;
|
|
||||||
if (OpenLayers.BROWSER_NAME === "safari") {
|
|
||||||
// Undo the Safari multiplying for analog scrolling
|
|
||||||
delta = delta / 10;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
delta = Math.round(delta / 120);
|
|
||||||
}
|
}
|
||||||
|
delta = delta / 120;
|
||||||
} else if (e.detail) {
|
} else if (e.detail) {
|
||||||
delta = -e.detail / 3;
|
// detail in Firefox on OS X is 1/3 of Windows
|
||||||
|
// so force delta 1 / -1
|
||||||
|
delta = - (e.detail / Math.abs(e.detail));
|
||||||
}
|
}
|
||||||
this.delta = this.delta + delta;
|
this.delta = this.delta + delta;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user