Named exports from ol/events

This commit is contained in:
Tim Schaub
2018-01-24 10:09:57 -07:00
parent 1786bbbe80
commit 7e7631c42a
74 changed files with 437 additions and 445 deletions
+2 -2
View File
@@ -6,7 +6,7 @@ import {equals} from '../array.js';
import Control from '../control/Control.js';
import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js';
import {removeChildren, replaceNode} from '../dom.js';
import _ol_events_ from '../events.js';
import {listen} from '../events.js';
import EventType from '../events/EventType.js';
import Layer from '../layer/Layer.js';
@@ -87,7 +87,7 @@ const Attribution = function(opt_options) {
button.title = tipLabel;
button.appendChild(activeLabel);
_ol_events_.listen(button, EventType.CLICK, this.handleClick_, this);
listen(button, EventType.CLICK, this.handleClick_, this);
const cssClasses = className + ' ' + CLASS_UNSELECTABLE + ' ' + CLASS_CONTROL +
(this.collapsed_ && this.collapsible_ ? ' ol-collapsed' : '') +
+3 -3
View File
@@ -5,7 +5,7 @@ import {inherits, nullFunction} from '../index.js';
import MapEventType from '../MapEventType.js';
import BaseObject from '../Object.js';
import {removeNode} from '../dom.js';
import _ol_events_ from '../events.js';
import {listen, unlistenByKey} from '../events.js';
/**
* @classdesc
@@ -110,7 +110,7 @@ Control.prototype.setMap = function(map) {
removeNode(this.element);
}
for (let i = 0, ii = this.listenerKeys.length; i < ii; ++i) {
_ol_events_.unlistenByKey(this.listenerKeys[i]);
unlistenByKey(this.listenerKeys[i]);
}
this.listenerKeys.length = 0;
this.map_ = map;
@@ -119,7 +119,7 @@ Control.prototype.setMap = function(map) {
this.target_ : map.getOverlayContainerStopEvent();
target.appendChild(this.element);
if (this.render !== nullFunction) {
this.listenerKeys.push(_ol_events_.listen(map,
this.listenerKeys.push(listen(map,
MapEventType.POSTRENDER, this.render, this));
}
map.render();
+3 -3
View File
@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
import Control from '../control/Control.js';
import {CLASS_CONTROL, CLASS_UNSELECTABLE, CLASS_UNSUPPORTED} from '../css.js';
import {replaceNode} from '../dom.js';
import _ol_events_ from '../events.js';
import {listen} from '../events.js';
import EventType from '../events/EventType.js';
/**
@@ -61,7 +61,7 @@ const FullScreen = function(opt_options) {
button.title = tipLabel;
button.appendChild(this.labelNode_);
_ol_events_.listen(button, EventType.CLICK,
listen(button, EventType.CLICK,
this.handleClick_, this);
const cssClasses = this.cssClassName_ + ' ' + CLASS_UNSELECTABLE +
@@ -161,7 +161,7 @@ FullScreen.prototype.handleFullScreenChange_ = function() {
FullScreen.prototype.setMap = function(map) {
Control.prototype.setMap.call(this, map);
if (map) {
this.listenerKeys.push(_ol_events_.listen(document,
this.listenerKeys.push(listen(document,
FullScreen.getChangeType_(),
this.handleFullScreenChange_, this)
);
+4 -4
View File
@@ -3,7 +3,7 @@
*/
import {inherits} from '../index.js';
import _ol_events_ from '../events.js';
import {listen} from '../events.js';
import EventType from '../events/EventType.js';
import BaseObject from '../Object.js';
import Control from '../control/Control.js';
@@ -38,7 +38,7 @@ const MousePosition = function(opt_options) {
target: options.target
});
_ol_events_.listen(this,
listen(this,
BaseObject.getChangeEventType(MousePosition.Property_.PROJECTION),
this.handleProjectionChanged_, this);
@@ -171,9 +171,9 @@ MousePosition.prototype.setMap = function(map) {
if (map) {
const viewport = map.getViewport();
this.listenerKeys.push(
_ol_events_.listen(viewport, EventType.MOUSEMOVE,
listen(viewport, EventType.MOUSEMOVE,
this.handleMouseMove, this),
_ol_events_.listen(viewport, EventType.MOUSEOUT,
listen(viewport, EventType.MOUSEOUT,
this.handleMouseOut, this)
);
}
+6 -6
View File
@@ -15,7 +15,7 @@ import Control from '../control/Control.js';
import _ol_coordinate_ from '../coordinate.js';
import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js';
import {replaceNode} from '../dom.js';
import _ol_events_ from '../events.js';
import {listen, listenOnce, unlisten} from '../events.js';
import EventType from '../events/EventType.js';
import {containsExtent, getBottomLeft, getBottomRight, getTopLeft, getTopRight, scaleFromCenter} from '../extent.js';
@@ -101,7 +101,7 @@ const OverviewMap = function(opt_options) {
button.title = tipLabel;
button.appendChild(activeLabel);
_ol_events_.listen(button, EventType.CLICK,
listen(button, EventType.CLICK,
this.handleClick_, this);
/**
@@ -225,7 +225,7 @@ OverviewMap.prototype.setMap = function(map) {
if (map) {
this.ovmap_.setTarget(this.ovmapDiv_);
this.listenerKeys.push(_ol_events_.listen(
this.listenerKeys.push(listen(
map, ObjectEventType.PROPERTYCHANGE,
this.handleMapPropertyChange_, this));
@@ -269,7 +269,7 @@ OverviewMap.prototype.handleMapPropertyChange_ = function(event) {
* @private
*/
OverviewMap.prototype.bindView_ = function(view) {
_ol_events_.listen(view,
listen(view,
BaseObject.getChangeEventType(ViewProperty.ROTATION),
this.handleRotationChanged_, this);
};
@@ -281,7 +281,7 @@ OverviewMap.prototype.bindView_ = function(view) {
* @private
*/
OverviewMap.prototype.unbindView_ = function(view) {
_ol_events_.unlisten(view,
unlisten(view,
BaseObject.getChangeEventType(ViewProperty.ROTATION),
this.handleRotationChanged_, this);
};
@@ -503,7 +503,7 @@ OverviewMap.prototype.handleToggle_ = function() {
if (!this.collapsed_ && !ovmap.isRendered()) {
ovmap.updateSize();
this.resetExtent_();
_ol_events_.listenOnce(ovmap, MapEventType.POSTRENDER,
listenOnce(ovmap, MapEventType.POSTRENDER,
function(event) {
this.updateBox_();
},
+2 -2
View File
@@ -5,7 +5,7 @@
import Control from '../control/Control.js';
import {CLASS_CONTROL, CLASS_HIDDEN, CLASS_UNSELECTABLE} from '../css.js';
import {easeOut} from '../easing.js';
import _ol_events_ from '../events.js';
import {listen} from '../events.js';
import EventType from '../events/EventType.js';
import {inherits} from '../index.js';
@@ -51,7 +51,7 @@ const Rotate = function(opt_options) {
button.title = tipLabel;
button.appendChild(this.label_);
_ol_events_.listen(button, EventType.CLICK,
listen(button, EventType.CLICK,
Rotate.prototype.handleClick_, this);
const cssClasses = className + ' ' + CLASS_UNSELECTABLE + ' ' + CLASS_CONTROL;
+2 -2
View File
@@ -7,7 +7,7 @@ import {assert} from '../asserts.js';
import Control from '../control/Control.js';
import ScaleLineUnits from '../control/ScaleLineUnits.js';
import {CLASS_UNSELECTABLE} from '../css.js';
import _ol_events_ from '../events.js';
import {listen} from '../events.js';
import {getPointResolution, METERS_PER_UNIT} from '../proj.js';
import Units from '../proj/Units.js';
@@ -85,7 +85,7 @@ const ScaleLine = function(opt_options) {
target: options.target
});
_ol_events_.listen(
listen(
this, BaseObject.getChangeEventType(ScaleLine.Property_.UNITS),
this.handleUnitsChanged_, this);
+3 -3
View File
@@ -2,7 +2,7 @@
* @module ol/control/Zoom
*/
import {inherits} from '../index.js';
import _ol_events_ from '../events.js';
import {listen} from '../events.js';
import EventType from '../events/EventType.js';
import Control from '../control/Control.js';
import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js';
@@ -43,7 +43,7 @@ const Zoom = function(opt_options) {
typeof zoomInLabel === 'string' ? document.createTextNode(zoomInLabel) : zoomInLabel
);
_ol_events_.listen(inElement, EventType.CLICK,
listen(inElement, EventType.CLICK,
Zoom.prototype.handleClick_.bind(this, delta));
const outElement = document.createElement('button');
@@ -54,7 +54,7 @@ const Zoom = function(opt_options) {
typeof zoomOutLabel === 'string' ? document.createTextNode(zoomOutLabel) : zoomOutLabel
);
_ol_events_.listen(outElement, EventType.CLICK,
listen(outElement, EventType.CLICK,
Zoom.prototype.handleClick_.bind(this, -delta));
const cssClasses = className + ' ' + CLASS_UNSELECTABLE + ' ' + CLASS_CONTROL;
+6 -6
View File
@@ -8,7 +8,7 @@ import ViewHint from '../ViewHint.js';
import Control from '../control/Control.js';
import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js';
import {easeOut} from '../easing.js';
import _ol_events_ from '../events.js';
import {listen} from '../events.js';
import Event from '../events/Event.js';
import EventType from '../events/EventType.js';
import {clamp} from '../math.js';
@@ -113,16 +113,16 @@ const ZoomSlider = function(opt_options) {
*/
this.dragger_ = new PointerEventHandler(containerElement);
_ol_events_.listen(this.dragger_, PointerEventType.POINTERDOWN,
listen(this.dragger_, PointerEventType.POINTERDOWN,
this.handleDraggerStart_, this);
_ol_events_.listen(this.dragger_, PointerEventType.POINTERMOVE,
listen(this.dragger_, PointerEventType.POINTERMOVE,
this.handleDraggerDrag_, this);
_ol_events_.listen(this.dragger_, PointerEventType.POINTERUP,
listen(this.dragger_, PointerEventType.POINTERUP,
this.handleDraggerEnd_, this);
_ol_events_.listen(containerElement, EventType.CLICK,
listen(containerElement, EventType.CLICK,
this.handleContainerClick_, this);
_ol_events_.listen(thumbElement, EventType.CLICK,
listen(thumbElement, EventType.CLICK,
Event.stopPropagation);
const render = options.render ? options.render : ZoomSlider.render;
+2 -2
View File
@@ -2,7 +2,7 @@
* @module ol/control/ZoomToExtent
*/
import {inherits} from '../index.js';
import _ol_events_ from '../events.js';
import {listen} from '../events.js';
import EventType from '../events/EventType.js';
import Control from '../control/Control.js';
import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js';
@@ -39,7 +39,7 @@ const ZoomToExtent = function(opt_options) {
typeof label === 'string' ? document.createTextNode(label) : label
);
_ol_events_.listen(button, EventType.CLICK,
listen(button, EventType.CLICK,
this.handleClick_, this);
const cssClasses = className + ' ' + CLASS_UNSELECTABLE + ' ' + CLASS_CONTROL;