Transformed
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
goog.provide('ol.events.Event');
|
||||
|
||||
|
||||
/**
|
||||
* @module ol/events/Event
|
||||
*/
|
||||
/**
|
||||
* @classdesc
|
||||
* Stripped down implementation of the W3C DOM Level 2 Event interface.
|
||||
@@ -15,7 +15,7 @@ goog.provide('ol.events.Event');
|
||||
* @implements {oli.events.Event}
|
||||
* @param {string} type Type.
|
||||
*/
|
||||
ol.events.Event = function(type) {
|
||||
var _ol_events_Event_ = function(type) {
|
||||
|
||||
/**
|
||||
* @type {boolean}
|
||||
@@ -45,7 +45,7 @@ ol.events.Event = function(type) {
|
||||
* @override
|
||||
* @api
|
||||
*/
|
||||
ol.events.Event.prototype.preventDefault =
|
||||
_ol_events_Event_.prototype.preventDefault =
|
||||
|
||||
/**
|
||||
* Stop event propagation.
|
||||
@@ -53,7 +53,7 @@ ol.events.Event.prototype.preventDefault =
|
||||
* @override
|
||||
* @api
|
||||
*/
|
||||
ol.events.Event.prototype.stopPropagation = function() {
|
||||
_ol_events_Event_.prototype.stopPropagation = function() {
|
||||
this.propagationStopped = true;
|
||||
};
|
||||
|
||||
@@ -61,7 +61,7 @@ ol.events.Event.prototype.preventDefault =
|
||||
/**
|
||||
* @param {Event|ol.events.Event} evt Event
|
||||
*/
|
||||
ol.events.Event.stopPropagation = function(evt) {
|
||||
_ol_events_Event_.stopPropagation = function(evt) {
|
||||
evt.stopPropagation();
|
||||
};
|
||||
|
||||
@@ -69,6 +69,7 @@ ol.events.Event.stopPropagation = function(evt) {
|
||||
/**
|
||||
* @param {Event|ol.events.Event} evt Event
|
||||
*/
|
||||
ol.events.Event.preventDefault = function(evt) {
|
||||
_ol_events_Event_.preventDefault = function(evt) {
|
||||
evt.preventDefault();
|
||||
};
|
||||
export default _ol_events_Event_;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
goog.provide('ol.events.EventTarget');
|
||||
|
||||
goog.require('ol');
|
||||
goog.require('ol.Disposable');
|
||||
goog.require('ol.events');
|
||||
goog.require('ol.events.Event');
|
||||
|
||||
/**
|
||||
* @module ol/events/EventTarget
|
||||
*/
|
||||
import _ol_ from '../index.js';
|
||||
import _ol_Disposable_ from '../Disposable.js';
|
||||
import _ol_events_ from '../events.js';
|
||||
import _ol_events_Event_ from '../events/Event.js';
|
||||
|
||||
/**
|
||||
* @classdesc
|
||||
@@ -24,9 +24,9 @@ goog.require('ol.events.Event');
|
||||
* @constructor
|
||||
* @extends {ol.Disposable}
|
||||
*/
|
||||
ol.events.EventTarget = function() {
|
||||
var _ol_events_EventTarget_ = function() {
|
||||
|
||||
ol.Disposable.call(this);
|
||||
_ol_Disposable_.call(this);
|
||||
|
||||
/**
|
||||
* @private
|
||||
@@ -47,14 +47,15 @@ ol.events.EventTarget = function() {
|
||||
this.listeners_ = {};
|
||||
|
||||
};
|
||||
ol.inherits(ol.events.EventTarget, ol.Disposable);
|
||||
|
||||
_ol_.inherits(_ol_events_EventTarget_, _ol_Disposable_);
|
||||
|
||||
|
||||
/**
|
||||
* @param {string} type Type.
|
||||
* @param {ol.EventsListenerFunctionType} listener Listener.
|
||||
*/
|
||||
ol.events.EventTarget.prototype.addEventListener = function(type, listener) {
|
||||
_ol_events_EventTarget_.prototype.addEventListener = function(type, listener) {
|
||||
var listeners = this.listeners_[type];
|
||||
if (!listeners) {
|
||||
listeners = this.listeners_[type] = [];
|
||||
@@ -72,8 +73,8 @@ ol.events.EventTarget.prototype.addEventListener = function(type, listener) {
|
||||
* @return {boolean|undefined} `false` if anyone called preventDefault on the
|
||||
* event object or if any of the listeners returned false.
|
||||
*/
|
||||
ol.events.EventTarget.prototype.dispatchEvent = function(event) {
|
||||
var evt = typeof event === 'string' ? new ol.events.Event(event) : event;
|
||||
_ol_events_EventTarget_.prototype.dispatchEvent = function(event) {
|
||||
var evt = typeof event === 'string' ? new _ol_events_Event_(event) : event;
|
||||
var type = evt.type;
|
||||
evt.target = this;
|
||||
var listeners = this.listeners_[type];
|
||||
@@ -95,7 +96,7 @@ ol.events.EventTarget.prototype.dispatchEvent = function(event) {
|
||||
var pendingRemovals = this.pendingRemovals_[type];
|
||||
delete this.pendingRemovals_[type];
|
||||
while (pendingRemovals--) {
|
||||
this.removeEventListener(type, ol.nullFunction);
|
||||
this.removeEventListener(type, _ol_.nullFunction);
|
||||
}
|
||||
delete this.dispatching_[type];
|
||||
}
|
||||
@@ -107,8 +108,8 @@ ol.events.EventTarget.prototype.dispatchEvent = function(event) {
|
||||
/**
|
||||
* @inheritDoc
|
||||
*/
|
||||
ol.events.EventTarget.prototype.disposeInternal = function() {
|
||||
ol.events.unlistenAll(this);
|
||||
_ol_events_EventTarget_.prototype.disposeInternal = function() {
|
||||
_ol_events_.unlistenAll(this);
|
||||
};
|
||||
|
||||
|
||||
@@ -119,7 +120,7 @@ ol.events.EventTarget.prototype.disposeInternal = function() {
|
||||
* @param {string} type Type.
|
||||
* @return {Array.<ol.EventsListenerFunctionType>} Listeners.
|
||||
*/
|
||||
ol.events.EventTarget.prototype.getListeners = function(type) {
|
||||
_ol_events_EventTarget_.prototype.getListeners = function(type) {
|
||||
return this.listeners_[type];
|
||||
};
|
||||
|
||||
@@ -129,7 +130,7 @@ ol.events.EventTarget.prototype.getListeners = function(type) {
|
||||
* `true` will be returned if this EventTarget has any listeners.
|
||||
* @return {boolean} Has listeners.
|
||||
*/
|
||||
ol.events.EventTarget.prototype.hasListener = function(opt_type) {
|
||||
_ol_events_EventTarget_.prototype.hasListener = function(opt_type) {
|
||||
return opt_type ?
|
||||
opt_type in this.listeners_ :
|
||||
Object.keys(this.listeners_).length > 0;
|
||||
@@ -140,13 +141,13 @@ ol.events.EventTarget.prototype.hasListener = function(opt_type) {
|
||||
* @param {string} type Type.
|
||||
* @param {ol.EventsListenerFunctionType} listener Listener.
|
||||
*/
|
||||
ol.events.EventTarget.prototype.removeEventListener = function(type, listener) {
|
||||
_ol_events_EventTarget_.prototype.removeEventListener = function(type, listener) {
|
||||
var listeners = this.listeners_[type];
|
||||
if (listeners) {
|
||||
var index = listeners.indexOf(listener);
|
||||
if (type in this.pendingRemovals_) {
|
||||
// make listener a no-op, and remove later in #dispatchEvent()
|
||||
listeners[index] = ol.nullFunction;
|
||||
listeners[index] = _ol_.nullFunction;
|
||||
++this.pendingRemovals_[type];
|
||||
} else {
|
||||
listeners.splice(index, 1);
|
||||
@@ -156,3 +157,4 @@ ol.events.EventTarget.prototype.removeEventListener = function(type, listener) {
|
||||
}
|
||||
}
|
||||
};
|
||||
export default _ol_events_EventTarget_;
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
goog.provide('ol.events.EventType');
|
||||
|
||||
/**
|
||||
* @module ol/events/EventType
|
||||
*/
|
||||
/**
|
||||
* @enum {string}
|
||||
* @const
|
||||
*/
|
||||
ol.events.EventType = {
|
||||
var _ol_events_EventType_ = {
|
||||
/**
|
||||
* Generic change event. Triggered when the revision counter is increased.
|
||||
* @event ol.events.Event#change
|
||||
@@ -34,3 +35,5 @@ ol.events.EventType = {
|
||||
TOUCHEND: 'touchend',
|
||||
WHEEL: 'wheel'
|
||||
};
|
||||
|
||||
export default _ol_events_EventType_;
|
||||
|
||||
@@ -1,12 +1,15 @@
|
||||
goog.provide('ol.events.KeyCode');
|
||||
|
||||
/**
|
||||
* @module ol/events/KeyCode
|
||||
*/
|
||||
/**
|
||||
* @enum {number}
|
||||
* @const
|
||||
*/
|
||||
ol.events.KeyCode = {
|
||||
var _ol_events_KeyCode_ = {
|
||||
LEFT: 37,
|
||||
UP: 38,
|
||||
RIGHT: 39,
|
||||
DOWN: 40
|
||||
};
|
||||
|
||||
export default _ol_events_KeyCode_;
|
||||
|
||||
+32
-30
@@ -1,9 +1,11 @@
|
||||
goog.provide('ol.events.condition');
|
||||
|
||||
goog.require('ol.MapBrowserEventType');
|
||||
goog.require('ol.asserts');
|
||||
goog.require('ol.functions');
|
||||
goog.require('ol.has');
|
||||
/**
|
||||
* @module ol/events/condition
|
||||
*/
|
||||
import _ol_MapBrowserEventType_ from '../MapBrowserEventType.js';
|
||||
import _ol_asserts_ from '../asserts.js';
|
||||
import _ol_functions_ from '../functions.js';
|
||||
import _ol_has_ from '../has.js';
|
||||
var _ol_events_condition_ = {};
|
||||
|
||||
|
||||
/**
|
||||
@@ -14,7 +16,7 @@ goog.require('ol.has');
|
||||
* @return {boolean} True if only the alt key is pressed.
|
||||
* @api
|
||||
*/
|
||||
ol.events.condition.altKeyOnly = function(mapBrowserEvent) {
|
||||
_ol_events_condition_.altKeyOnly = function(mapBrowserEvent) {
|
||||
var originalEvent = mapBrowserEvent.originalEvent;
|
||||
return (
|
||||
originalEvent.altKey &&
|
||||
@@ -31,7 +33,7 @@ ol.events.condition.altKeyOnly = function(mapBrowserEvent) {
|
||||
* @return {boolean} True if only the alt and shift keys are pressed.
|
||||
* @api
|
||||
*/
|
||||
ol.events.condition.altShiftKeysOnly = function(mapBrowserEvent) {
|
||||
_ol_events_condition_.altShiftKeysOnly = function(mapBrowserEvent) {
|
||||
var originalEvent = mapBrowserEvent.originalEvent;
|
||||
return (
|
||||
originalEvent.altKey &&
|
||||
@@ -48,7 +50,7 @@ ol.events.condition.altShiftKeysOnly = function(mapBrowserEvent) {
|
||||
* @function
|
||||
* @api
|
||||
*/
|
||||
ol.events.condition.always = ol.functions.TRUE;
|
||||
_ol_events_condition_.always = _ol_functions_.TRUE;
|
||||
|
||||
|
||||
/**
|
||||
@@ -58,8 +60,8 @@ ol.events.condition.always = ol.functions.TRUE;
|
||||
* @return {boolean} True if the event is a map `click` event.
|
||||
* @api
|
||||
*/
|
||||
ol.events.condition.click = function(mapBrowserEvent) {
|
||||
return mapBrowserEvent.type == ol.MapBrowserEventType.CLICK;
|
||||
_ol_events_condition_.click = function(mapBrowserEvent) {
|
||||
return mapBrowserEvent.type == _ol_MapBrowserEventType_.CLICK;
|
||||
};
|
||||
|
||||
|
||||
@@ -72,10 +74,10 @@ ol.events.condition.click = function(mapBrowserEvent) {
|
||||
* @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
|
||||
* @return {boolean} The result.
|
||||
*/
|
||||
ol.events.condition.mouseActionButton = function(mapBrowserEvent) {
|
||||
_ol_events_condition_.mouseActionButton = function(mapBrowserEvent) {
|
||||
var originalEvent = mapBrowserEvent.originalEvent;
|
||||
return originalEvent.button == 0 &&
|
||||
!(ol.has.WEBKIT && ol.has.MAC && originalEvent.ctrlKey);
|
||||
!(_ol_has_.WEBKIT && _ol_has_.MAC && originalEvent.ctrlKey);
|
||||
};
|
||||
|
||||
|
||||
@@ -87,7 +89,7 @@ ol.events.condition.mouseActionButton = function(mapBrowserEvent) {
|
||||
* @function
|
||||
* @api
|
||||
*/
|
||||
ol.events.condition.never = ol.functions.FALSE;
|
||||
_ol_events_condition_.never = _ol_functions_.FALSE;
|
||||
|
||||
|
||||
/**
|
||||
@@ -98,7 +100,7 @@ ol.events.condition.never = ol.functions.FALSE;
|
||||
* @return {boolean} True if the browser event is a `pointermove` event.
|
||||
* @api
|
||||
*/
|
||||
ol.events.condition.pointerMove = function(mapBrowserEvent) {
|
||||
_ol_events_condition_.pointerMove = function(mapBrowserEvent) {
|
||||
return mapBrowserEvent.type == 'pointermove';
|
||||
};
|
||||
|
||||
@@ -110,8 +112,8 @@ ol.events.condition.pointerMove = function(mapBrowserEvent) {
|
||||
* @return {boolean} True if the event is a map `singleclick` event.
|
||||
* @api
|
||||
*/
|
||||
ol.events.condition.singleClick = function(mapBrowserEvent) {
|
||||
return mapBrowserEvent.type == ol.MapBrowserEventType.SINGLECLICK;
|
||||
_ol_events_condition_.singleClick = function(mapBrowserEvent) {
|
||||
return mapBrowserEvent.type == _ol_MapBrowserEventType_.SINGLECLICK;
|
||||
};
|
||||
|
||||
|
||||
@@ -122,8 +124,8 @@ ol.events.condition.singleClick = function(mapBrowserEvent) {
|
||||
* @return {boolean} True if the event is a map `dblclick` event.
|
||||
* @api
|
||||
*/
|
||||
ol.events.condition.doubleClick = function(mapBrowserEvent) {
|
||||
return mapBrowserEvent.type == ol.MapBrowserEventType.DBLCLICK;
|
||||
_ol_events_condition_.doubleClick = function(mapBrowserEvent) {
|
||||
return mapBrowserEvent.type == _ol_MapBrowserEventType_.DBLCLICK;
|
||||
};
|
||||
|
||||
|
||||
@@ -135,7 +137,7 @@ ol.events.condition.doubleClick = function(mapBrowserEvent) {
|
||||
* @return {boolean} True only if there no modifier keys are pressed.
|
||||
* @api
|
||||
*/
|
||||
ol.events.condition.noModifierKeys = function(mapBrowserEvent) {
|
||||
_ol_events_condition_.noModifierKeys = function(mapBrowserEvent) {
|
||||
var originalEvent = mapBrowserEvent.originalEvent;
|
||||
return (
|
||||
!originalEvent.altKey &&
|
||||
@@ -153,12 +155,11 @@ ol.events.condition.noModifierKeys = function(mapBrowserEvent) {
|
||||
* @return {boolean} True if only the platform modifier key is pressed.
|
||||
* @api
|
||||
*/
|
||||
ol.events.condition.platformModifierKeyOnly = function(mapBrowserEvent) {
|
||||
_ol_events_condition_.platformModifierKeyOnly = function(mapBrowserEvent) {
|
||||
var originalEvent = mapBrowserEvent.originalEvent;
|
||||
return (
|
||||
!originalEvent.altKey &&
|
||||
(ol.has.MAC ? originalEvent.metaKey : originalEvent.ctrlKey) &&
|
||||
!originalEvent.shiftKey);
|
||||
return !originalEvent.altKey &&
|
||||
(_ol_has_.MAC ? originalEvent.metaKey : originalEvent.ctrlKey) &&
|
||||
!originalEvent.shiftKey;
|
||||
};
|
||||
|
||||
|
||||
@@ -170,7 +171,7 @@ ol.events.condition.platformModifierKeyOnly = function(mapBrowserEvent) {
|
||||
* @return {boolean} True if only the shift key is pressed.
|
||||
* @api
|
||||
*/
|
||||
ol.events.condition.shiftKeyOnly = function(mapBrowserEvent) {
|
||||
_ol_events_condition_.shiftKeyOnly = function(mapBrowserEvent) {
|
||||
var originalEvent = mapBrowserEvent.originalEvent;
|
||||
return (
|
||||
!originalEvent.altKey &&
|
||||
@@ -187,7 +188,7 @@ ol.events.condition.shiftKeyOnly = function(mapBrowserEvent) {
|
||||
* @return {boolean} True only if the target element is not editable.
|
||||
* @api
|
||||
*/
|
||||
ol.events.condition.targetNotEditable = function(mapBrowserEvent) {
|
||||
_ol_events_condition_.targetNotEditable = function(mapBrowserEvent) {
|
||||
var target = mapBrowserEvent.originalEvent.target;
|
||||
var tagName = target.tagName;
|
||||
return (
|
||||
@@ -204,8 +205,8 @@ ol.events.condition.targetNotEditable = function(mapBrowserEvent) {
|
||||
* @return {boolean} True if the event originates from a mouse device.
|
||||
* @api
|
||||
*/
|
||||
ol.events.condition.mouseOnly = function(mapBrowserEvent) {
|
||||
ol.asserts.assert(mapBrowserEvent.pointerEvent, 56); // mapBrowserEvent must originate from a pointer event
|
||||
_ol_events_condition_.mouseOnly = function(mapBrowserEvent) {
|
||||
_ol_asserts_.assert(mapBrowserEvent.pointerEvent, 56); // mapBrowserEvent must originate from a pointer event
|
||||
// see http://www.w3.org/TR/pointerevents/#widl-PointerEvent-pointerType
|
||||
return /** @type {ol.MapBrowserEvent} */ (mapBrowserEvent).pointerEvent.pointerType == 'mouse';
|
||||
};
|
||||
@@ -220,7 +221,8 @@ ol.events.condition.mouseOnly = function(mapBrowserEvent) {
|
||||
* @return {boolean} True if the event originates from a primary pointer.
|
||||
* @api
|
||||
*/
|
||||
ol.events.condition.primaryAction = function(mapBrowserEvent) {
|
||||
_ol_events_condition_.primaryAction = function(mapBrowserEvent) {
|
||||
var pointerEvent = mapBrowserEvent.pointerEvent;
|
||||
return pointerEvent.isPrimary && pointerEvent.button === 0;
|
||||
};
|
||||
export default _ol_events_condition_;
|
||||
|
||||
Reference in New Issue
Block a user