ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8729 from fredj/misc

Browse Source 
Move functions out of the PointerEvent class
This commit is contained in:
Frédéric Junod
2018-09-27 16:05:54 +02:00
committed by GitHub
parent 5bfd82a9bf 05c0b77a52
commit 2d68f1506c
1 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/pointer/PointerEvent.js
+58 -57
View File
@@ -69,12 +69,12 @@ class PointerEvent extends _Event {
/** /**
* @type {number} * @type {number}
*/ */
this.buttons = this.getButtons_(eventDict); this.buttons = getButtons(eventDict);
/** /**
* @type {number} * @type {number}
*/ */
this.pressure = this.getPressure_(eventDict, this.buttons); this.pressure = getPressure(eventDict, this.buttons);
// MouseEvent related properties // MouseEvent related properties
@@ -200,64 +200,65 @@ class PointerEvent extends _Event {
} }
} }
/** }
* @private
* @param {Object<string, ?>} eventDict The event dictionary.
* @return {number} Button indicator.
*/
getButtons_(eventDict) {
// According to the w3c spec,
// http://www.w3.org/TR/DOM-Level-3-Events/#events-MouseEvent-button
// MouseEvent.button == 0 can mean either no mouse button depressed, or the
// left mouse button depressed.
//
// As of now, the only way to distinguish between the two states of
// MouseEvent.button is by using the deprecated MouseEvent.which property, as
// this maps mouse buttons to positive integers > 0, and uses 0 to mean that
// no mouse button is held.
//
// MouseEvent.which is derived from MouseEvent.button at MouseEvent creation,
// but initMouseEvent does not expose an argument with which to set
// MouseEvent.which. Calling initMouseEvent with a buttonArg of 0 will set
// MouseEvent.button == 0 and MouseEvent.which == 1, breaking the expectations
// of app developers.
//
// The only way to propagate the correct state of MouseEvent.which and
// MouseEvent.button to a new MouseEvent.button == 0 and MouseEvent.which == 0
// is to call initMouseEvent with a buttonArg value of -1.
//
// This is fixed with DOM Level 4's use of buttons
let buttons;
if (eventDict.buttons || HAS_BUTTONS) {
buttons = eventDict.buttons;
} else {
switch (eventDict.which) {
case 1: buttons = 1; break;
case 2: buttons = 4; break;
case 3: buttons = 2; break;
default: buttons = 0;
}
}
return buttons;
}
/**
* @private /**
* @param {Object<string, ?>} eventDict The event dictionary. * @param {Object<string, ?>} eventDict The event dictionary.
* @param {number} buttons Button indicator. * @return {number} Button indicator.
* @return {number} The pressure. */
*/ function getButtons(eventDict) {
getPressure_(eventDict, buttons) { // According to the w3c spec,
// Spec requires that pointers without pressure specified use 0.5 for down // http://www.w3.org/TR/DOM-Level-3-Events/#events-MouseEvent-button
// state and 0 for up state. // MouseEvent.button == 0 can mean either no mouse button depressed, or the
let pressure = 0; // left mouse button depressed.
if (eventDict.pressure) { //
pressure = eventDict.pressure; // As of now, the only way to distinguish between the two states of
} else { // MouseEvent.button is by using the deprecated MouseEvent.which property, as
pressure = buttons ? 0.5 : 0; // this maps mouse buttons to positive integers > 0, and uses 0 to mean that
// no mouse button is held.
//
// MouseEvent.which is derived from MouseEvent.button at MouseEvent creation,
// but initMouseEvent does not expose an argument with which to set
// MouseEvent.which. Calling initMouseEvent with a buttonArg of 0 will set
// MouseEvent.button == 0 and MouseEvent.which == 1, breaking the expectations
// of app developers.
//
// The only way to propagate the correct state of MouseEvent.which and
// MouseEvent.button to a new MouseEvent.button == 0 and MouseEvent.which == 0
// is to call initMouseEvent with a buttonArg value of -1.
//
// This is fixed with DOM Level 4's use of buttons
let buttons;
if (eventDict.buttons || HAS_BUTTONS) {
buttons = eventDict.buttons;
} else {
switch (eventDict.which) {
case 1: buttons = 1; break;
case 2: buttons = 4; break;
case 3: buttons = 2; break;
default: buttons = 0;
} }
return pressure;
} }
return buttons;
}
/**
* @param {Object<string, ?>} eventDict The event dictionary.
* @param {number} buttons Button indicator.
* @return {number} The pressure.
*/
function getPressure(eventDict, buttons) {
// Spec requires that pointers without pressure specified use 0.5 for down
// state and 0 for up state.
let pressure = 0;
if (eventDict.pressure) {
pressure = eventDict.pressure;
} else {
pressure = buttons ? 0.5 : 0;
}
return pressure;
} }