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

Rename _ol_events_EventTarget_ to EventTarget

Browse Source
This commit is contained in:
Marc Jansen
2017-12-15 09:53:46 +01:00
committed by Frederic Junod
parent 5199371b9f
commit c620688758
16 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/ImageBase.js
+3 -3
View File
@@ -2,7 +2,7 @@
* @module ol/ImageBase
*/
import {inherits} from './index.js';
import _ol_events_EventTarget_ from './events/EventTarget.js';
import EventTarget from './events/EventTarget.js';
import EventType from './events/EventType.js';
/**
@@ -16,7 +16,7 @@ import EventType from './events/EventType.js';
*/
var _ol_ImageBase_ = function(extent, resolution, pixelRatio, state) {
_ol_events_EventTarget_.call(this);
EventTarget.call(this);
/**
* @protected
@@ -44,7 +44,7 @@ var _ol_ImageBase_ = function(extent, resolution, pixelRatio, state) {
};
inherits(_ol_ImageBase_, _ol_events_EventTarget_);
inherits(_ol_ImageBase_, EventTarget);
/**
src/ol/MapBrowserEventHandler.js
+4 -4
View File
@@ -6,7 +6,7 @@ import _ol_has_ from './has.js';
import MapBrowserEventType from './MapBrowserEventType.js';
import MapBrowserPointerEvent from './MapBrowserPointerEvent.js';
import _ol_events_ from './events.js';
import _ol_events_EventTarget_ from './events/EventTarget.js';
import EventTarget from './events/EventTarget.js';
import _ol_pointer_EventType_ from './pointer/EventType.js';
import _ol_pointer_PointerEventHandler_ from './pointer/PointerEventHandler.js';
@@ -18,7 +18,7 @@ import _ol_pointer_PointerEventHandler_ from './pointer/PointerEventHandler.js';
*/
var MapBrowserEventHandler = function(map, moveTolerance) {
_ol_events_EventTarget_.call(this);
EventTarget.call(this);
/**
* This is the element that we will listen to the real events on.
@@ -110,7 +110,7 @@ var MapBrowserEventHandler = function(map, moveTolerance) {
};
inherits(MapBrowserEventHandler, _ol_events_EventTarget_);
inherits(MapBrowserEventHandler, EventTarget);
/**
@@ -320,6 +320,6 @@ MapBrowserEventHandler.prototype.disposeInternal = function() {
this.pointerEventHandler_.dispose();
this.pointerEventHandler_ = null;
}
_ol_events_EventTarget_.prototype.disposeInternal.call(this);
EventTarget.prototype.disposeInternal.call(this);
};
export default MapBrowserEventHandler;
src/ol/Observable.js
+3 -3
View File
@@ -3,7 +3,7 @@
*/
import {inherits} from './index.js';
import _ol_events_ from './events.js';
import _ol_events_EventTarget_ from './events/EventTarget.js';
import EventTarget from './events/EventTarget.js';
import EventType from './events/EventType.js';
/**
@@ -22,7 +22,7 @@ import EventType from './events/EventType.js';
*/
var _ol_Observable_ = function() {
_ol_events_EventTarget_.call(this);
EventTarget.call(this);
/**
* @private
@@ -32,7 +32,7 @@ var _ol_Observable_ = function() {
};
inherits(_ol_Observable_, _ol_events_EventTarget_);
inherits(_ol_Observable_, EventTarget);
/**
src/ol/Tile.js
+3 -3
View File
@@ -4,7 +4,7 @@
import {inherits} from './index.js';
import _ol_TileState_ from './TileState.js';
import {easeIn} from './easing.js';
import _ol_events_EventTarget_ from './events/EventTarget.js';
import EventTarget from './events/EventTarget.js';
import EventType from './events/EventType.js';
/**
@@ -19,7 +19,7 @@ import EventType from './events/EventType.js';
* @param {olx.TileOptions=} opt_options Tile options.
*/
var _ol_Tile_ = function(tileCoord, state, opt_options) {
_ol_events_EventTarget_.call(this);
EventTarget.call(this);
var options = opt_options ? opt_options : {};
@@ -66,7 +66,7 @@ var _ol_Tile_ = function(tileCoord, state, opt_options) {
};
inherits(_ol_Tile_, _ol_events_EventTarget_);
inherits(_ol_Tile_, EventTarget);
/**
src/ol/events/EventTarget.js
+9 -9
View File
@@ -24,7 +24,7 @@ import Event from '../events/Event.js';
* @constructor
* @extends {ol.Disposable}
*/
var _ol_events_EventTarget_ = function() {
var EventTarget = function() {
_ol_Disposable_.call(this);
@@ -48,14 +48,14 @@ var _ol_events_EventTarget_ = function() {
};
inherits(_ol_events_EventTarget_, _ol_Disposable_);
inherits(EventTarget, _ol_Disposable_);
/**
* @param {string} type Type.
* @param {ol.EventsListenerFunctionType} listener Listener.
*/
_ol_events_EventTarget_.prototype.addEventListener = function(type, listener) {
EventTarget.prototype.addEventListener = function(type, listener) {
var listeners = this.listeners_[type];
if (!listeners) {
listeners = this.listeners_[type] = [];
@@ -73,7 +73,7 @@ _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) {
EventTarget.prototype.dispatchEvent = function(event) {
var evt = typeof event === 'string' ? new Event(event) : event;
var type = evt.type;
evt.target = this;
@@ -108,7 +108,7 @@ _ol_events_EventTarget_.prototype.dispatchEvent = function(event) {
/**
* @inheritDoc
*/
_ol_events_EventTarget_.prototype.disposeInternal = function() {
EventTarget.prototype.disposeInternal = function() {
_ol_events_.unlistenAll(this);
};
@@ -120,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) {
EventTarget.prototype.getListeners = function(type) {
return this.listeners_[type];
};
@@ -130,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) {
EventTarget.prototype.hasListener = function(opt_type) {
return opt_type ?
opt_type in this.listeners_ :
Object.keys(this.listeners_).length > 0;
@@ -141,7 +141,7 @@ _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) {
EventTarget.prototype.removeEventListener = function(type, listener) {
var listeners = this.listeners_[type];
if (listeners) {
var index = listeners.indexOf(listener);
@@ -157,4 +157,4 @@ _ol_events_EventTarget_.prototype.removeEventListener = function(type, listener)
}
}
};
export default _ol_events_EventTarget_;
export default EventTarget;
src/ol/pointer/PointerEventHandler.js
+4 -4
View File
@@ -33,7 +33,7 @@
import {inherits} from '../index.js';
import _ol_events_ from '../events.js';
import _ol_events_EventTarget_ from '../events/EventTarget.js';
import EventTarget from '../events/EventTarget.js';
import _ol_has_ from '../has.js';
import _ol_pointer_EventType_ from '../pointer/EventType.js';
import _ol_pointer_MouseSource_ from '../pointer/MouseSource.js';
@@ -48,7 +48,7 @@ import _ol_pointer_TouchSource_ from '../pointer/TouchSource.js';
* @param {Element|HTMLDocument} element Viewport element.
*/
var _ol_pointer_PointerEventHandler_ = function(element) {
_ol_events_EventTarget_.call(this);
EventTarget.call(this);
/**
* @const
@@ -78,7 +78,7 @@ var _ol_pointer_PointerEventHandler_ = function(element) {
this.registerSources();
};
inherits(_ol_pointer_PointerEventHandler_, _ol_events_EventTarget_);
inherits(_ol_pointer_PointerEventHandler_, EventTarget);
/**
@@ -399,7 +399,7 @@ _ol_pointer_PointerEventHandler_.prototype.wrapMouseEvent = function(eventType,
*/
_ol_pointer_PointerEventHandler_.prototype.disposeInternal = function() {
this.unregister_();
_ol_events_EventTarget_.prototype.disposeInternal.call(this);
EventTarget.prototype.disposeInternal.call(this);
};
src/ol/structs/LRUCache.js
+3 -3
View File
@@ -3,7 +3,7 @@
*/
import {inherits} from '../index.js';
import _ol_asserts_ from '../asserts.js';
import _ol_events_EventTarget_ from '../events/EventTarget.js';
import EventTarget from '../events/EventTarget.js';
import EventType from '../events/EventType.js';
/**
@@ -19,7 +19,7 @@ import EventType from '../events/EventType.js';
*/
var _ol_structs_LRUCache_ = function(opt_highWaterMark) {
_ol_events_EventTarget_.call(this);
EventTarget.call(this);
/**
* @type {number}
@@ -52,7 +52,7 @@ var _ol_structs_LRUCache_ = function(opt_highWaterMark) {
};
inherits(_ol_structs_LRUCache_, _ol_events_EventTarget_);
inherits(_ol_structs_LRUCache_, EventTarget);
/**
src/ol/style/IconImage.js
+3 -3
View File
@@ -4,7 +4,7 @@
import {inherits} from '../index.js';
import {createCanvasContext2D} from '../dom.js';
import _ol_events_ from '../events.js';
import _ol_events_EventTarget_ from '../events/EventTarget.js';
import EventTarget from '../events/EventTarget.js';
import EventType from '../events/EventType.js';
import _ol_ImageState_ from '../ImageState.js';
import _ol_style_ from '../style.js';
@@ -22,7 +22,7 @@ import _ol_style_ from '../style.js';
var _ol_style_IconImage_ = function(image, src, size, crossOrigin, imageState,
color) {
_ol_events_EventTarget_.call(this);
EventTarget.call(this);
/**
* @private
@@ -89,7 +89,7 @@ var _ol_style_IconImage_ = function(image, src, size, crossOrigin, imageState,
};
inherits(_ol_style_IconImage_, _ol_events_EventTarget_);
inherits(_ol_style_IconImage_, EventTarget);
/**