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

Simplify events and store listeners only in one place

Browse Source
This commit is contained in:
ahocevar
2019-09-04 16:39:32 +02:00
parent d416866108
commit ebfb20440a
52 changed files with 224 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/control/Attribution.js
+1 -2
View File
@@ -5,7 +5,6 @@ import {equals} from '../array.js';
import Control from './Control.js';
import {CLASS_CONTROL, CLASS_UNSELECTABLE, CLASS_COLLAPSED} from '../css.js';
import {removeChildren, replaceNode} from '../dom.js';
import {listen} from '../events.js';
import EventType from '../events/EventType.js';
import {inView} from '../layer/Layer.js';
@@ -125,7 +124,7 @@ class Attribution extends Control {
button.title = tipLabel;
button.appendChild(activeLabel);
listen(button, EventType.CLICK, this.handleClick_, this);
button.addEventListener(EventType.CLICK, this.handleClick_.bind(this), false);
const cssClasses = className + ' ' + CLASS_UNSELECTABLE + ' ' + CLASS_CONTROL +
(this.collapsed_ && this.collapsible_ ? ' ' + CLASS_COLLAPSED : '') +
src/ol/control/FullScreen.js
+1 -2
View File
@@ -91,8 +91,7 @@ class FullScreen extends Control {
this.button_.title = tipLabel;
this.button_.appendChild(this.labelNode_);
listen(this.button_, EventType.CLICK,
this.handleClick_, this);
this.button_.addEventListener(EventType.CLICK, this.handleClick_.bind(this), false);
const cssClasses = this.cssClassName_ + ' ' + CLASS_UNSELECTABLE +
' ' + CLASS_CONTROL + ' ' +
src/ol/control/MousePosition.js
+1 -3
View File
@@ -68,9 +68,7 @@ class MousePosition extends Control {
target: options.target
});
listen(this,
getChangeEventType(PROJECTION),
this.handleProjectionChanged_, this);
this.addEventListener(getChangeEventType(PROJECTION), this.handleProjectionChanged_);
if (options.coordinateFormat) {
this.setCoordinateFormat(options.coordinateFormat);
src/ol/control/OverviewMap.js
+10 -9
View File
@@ -14,7 +14,7 @@ import Control from './Control.js';
import {rotate as rotateCoordinate, add as addCoordinate} from '../coordinate.js';
import {CLASS_CONTROL, CLASS_UNSELECTABLE, CLASS_COLLAPSED} from '../css.js';
import {replaceNode} from '../dom.js';
import {listen, listenOnce, unlisten} from '../events.js';
import {listen, listenOnce} from '../events.js';
import EventType from '../events/EventType.js';
import {containsExtent, getBottomLeft, getBottomRight, getTopLeft, getTopRight, scaleFromCenter} from '../extent.js';
@@ -84,6 +84,11 @@ class OverviewMap extends Control {
target: options.target
});
/**
* @private
*/
this.boundHandleRotationChanged_ = this.handleRotationChanged_.bind(this);
/**
* @type {boolean}
* @private
@@ -139,8 +144,7 @@ class OverviewMap extends Control {
button.title = tipLabel;
button.appendChild(activeLabel);
listen(button, EventType.CLICK,
this.handleClick_, this);
button.addEventListener(EventType.CLICK, this.handleClick_.bind(this), false);
/**
* @type {HTMLElement}
@@ -225,6 +229,7 @@ class OverviewMap extends Control {
window.addEventListener('mousemove', move);
window.addEventListener('mouseup', endMoving);
});
}
/**
@@ -284,9 +289,7 @@ class OverviewMap extends Control {
* @private
*/
bindView_(view) {
listen(view,
getChangeEventType(ViewProperty.ROTATION),
this.handleRotationChanged_, this);
view.addEventListener(getChangeEventType(ViewProperty.ROTATION), this.boundHandleRotationChanged_);
}
/**
@@ -295,9 +298,7 @@ class OverviewMap extends Control {
* @private
*/
unbindView_(view) {
unlisten(view,
getChangeEventType(ViewProperty.ROTATION),
this.handleRotationChanged_, this);
view.removeEventListener(getChangeEventType(ViewProperty.ROTATION), this.boundHandleRotationChanged_);
}
/**
src/ol/control/Rotate.js
+1 -2
View File
@@ -4,7 +4,6 @@
import Control from './Control.js';
import {CLASS_CONTROL, CLASS_HIDDEN, CLASS_UNSELECTABLE} from '../css.js';
import {easeOut} from '../easing.js';
import {listen} from '../events.js';
import EventType from '../events/EventType.js';
@@ -75,7 +74,7 @@ class Rotate extends Control {
button.title = tipLabel;
button.appendChild(this.label_);
listen(button, EventType.CLICK, this.handleClick_, this);
button.addEventListener(EventType.CLICK, this.handleClick_.bind(this), false);
const cssClasses = className + ' ' + CLASS_UNSELECTABLE + ' ' + CLASS_CONTROL;
const element = this.element;
src/ol/control/ScaleLine.js
+1 -4
View File
@@ -5,7 +5,6 @@ import {getChangeEventType} from '../Object.js';
import {assert} from '../asserts.js';
import Control from './Control.js';
import {CLASS_UNSELECTABLE} from '../css.js';
import {listen} from '../events.js';
import {getPointResolution, METERS_PER_UNIT} from '../proj.js';
import ProjUnits from '../proj/Units.js';
@@ -125,9 +124,7 @@ class ScaleLine extends Control {
*/
this.renderedHTML_ = '';
listen(
this, getChangeEventType(UNITS_PROP),
this.handleUnitsChanged_, this);
this.addEventListener(getChangeEventType(UNITS_PROP), this.handleUnitsChanged_);
this.setUnits(/** @type {Units} */ (options.units) || Units.METRIC);
src/ol/control/Zoom.js
+2 -3
View File
@@ -1,7 +1,6 @@
/**
* @module ol/control/Zoom
*/
import {listen} from '../events.js';
import EventType from '../events/EventType.js';
import Control from './Control.js';
import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js';
@@ -66,7 +65,7 @@ class Zoom extends Control {
typeof zoomInLabel === 'string' ? document.createTextNode(zoomInLabel) : zoomInLabel
);
listen(inElement, EventType.CLICK, this.handleClick_.bind(this, delta));
inElement.addEventListener(EventType.CLICK, this.handleClick_.bind(this, delta), false);
const outElement = document.createElement('button');
outElement.className = className + '-out';
@@ -76,7 +75,7 @@ class Zoom extends Control {
typeof zoomOutLabel === 'string' ? document.createTextNode(zoomOutLabel) : zoomOutLabel
);
listen(outElement, EventType.CLICK, this.handleClick_.bind(this, -delta));
outElement.addEventListener(EventType.CLICK, this.handleClick_.bind(this, -delta), false);
const cssClasses = className + ' ' + CLASS_UNSELECTABLE + ' ' + CLASS_CONTROL;
const element = this.element;
src/ol/control/ZoomSlider.js
+5 -8
View File
@@ -139,15 +139,12 @@ class ZoomSlider extends Control {
containerElement.className = className + ' ' + CLASS_UNSELECTABLE + ' ' + CLASS_CONTROL;
containerElement.appendChild(thumbElement);
listen(containerElement, PointerEventType.POINTERDOWN,
this.handleDraggerStart_, this);
listen(containerElement, PointerEventType.POINTERMOVE,
this.handleDraggerDrag_, this);
listen(containerElement, PointerEventType.POINTERUP,
this.handleDraggerEnd_, this);
containerElement.addEventListener(PointerEventType.POINTERDOWN, this.handleDraggerStart_.bind(this), false);
containerElement.addEventListener(PointerEventType.POINTERMOVE, this.handleDraggerDrag_.bind(this), false);
containerElement.addEventListener(PointerEventType.POINTERUP, this.handleDraggerEnd_.bind(this), false);
listen(containerElement, EventType.CLICK, this.handleContainerClick_, this);
listen(thumbElement, EventType.CLICK, stopPropagation);
containerElement.addEventListener(EventType.CLICK, this.handleContainerClick_.bind(this), false);
thumbElement.addEventListener(EventType.CLICK, stopPropagation, false);
}
/**
src/ol/control/ZoomToExtent.js
+1 -2
View File
@@ -1,7 +1,6 @@
/**
* @module ol/control/ZoomToExtent
*/
import {listen} from '../events.js';
import EventType from '../events/EventType.js';
import Control from './Control.js';
import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js';
@@ -57,7 +56,7 @@ class ZoomToExtent extends Control {
typeof label === 'string' ? document.createTextNode(label) : label
);
listen(button, EventType.CLICK, this.handleClick_, this);
button.addEventListener(EventType.CLICK, this.handleClick_.bind(this), false);
const cssClasses = className + ' ' + CLASS_UNSELECTABLE + ' ' + CLASS_CONTROL;
const element = this.element;