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

Rename _ol_pointer_PointerEventHandler_ to PointerEventHandler

Browse Source
This commit is contained in:
Tim Schaub
2018-01-11 10:34:33 -07:00
parent 176021e188
commit 8a74d6b8db
6 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ol/MapBrowserEventHandler.js
View File

@@ -8,7 +8,7 @@ import MapBrowserPointerEvent from './MapBrowserPointerEvent.js';
import _ol_events_ from './events.js'; import _ol_events_ from './events.js';
import EventTarget from './events/EventTarget.js'; import EventTarget from './events/EventTarget.js';
import PointerEventType from './pointer/EventType.js'; import PointerEventType from './pointer/EventType.js';
import _ol_pointer_PointerEventHandler_ from './pointer/PointerEventHandler.js'; import PointerEventHandler from './pointer/PointerEventHandler.js';
/** /**
* @param {ol.PluggableMap} map The map with the viewport to listen to events on. * @param {ol.PluggableMap} map The map with the viewport to listen to events on.
@@ -81,7 +81,7 @@ var MapBrowserEventHandler = function(map, moveTolerance) {
* @type {ol.pointer.PointerEventHandler} * @type {ol.pointer.PointerEventHandler}
* @private * @private
*/ */
this.pointerEventHandler_ = new _ol_pointer_PointerEventHandler_(element); this.pointerEventHandler_ = new PointerEventHandler(element);
/** /**
* Event handler which generates pointer events for * Event handler which generates pointer events for
@@ -218,7 +218,7 @@ MapBrowserEventHandler.prototype.handlePointerDown_ = function(pointerEvent) {
* the viewport when dragging. * the viewport when dragging.
*/ */
this.documentPointerEventHandler_ = this.documentPointerEventHandler_ =
new _ol_pointer_PointerEventHandler_(document); new PointerEventHandler(document);
this.dragListenerKeys_.push( this.dragListenerKeys_.push(
_ol_events_.listen(this.documentPointerEventHandler_, _ol_events_.listen(this.documentPointerEventHandler_,

4
src/ol/control/ZoomSlider.js
View File

@@ -13,7 +13,7 @@ import Event from '../events/Event.js';
import EventType from '../events/EventType.js'; import EventType from '../events/EventType.js';
import {clamp} from '../math.js'; import {clamp} from '../math.js';
import PointerEventType from '../pointer/EventType.js'; import PointerEventType from '../pointer/EventType.js';
import _ol_pointer_PointerEventHandler_ from '../pointer/PointerEventHandler.js'; import PointerEventHandler from '../pointer/PointerEventHandler.js';
/** /**
* @classdesc * @classdesc
@@ -111,7 +111,7 @@ var ZoomSlider = function(opt_options) {
* @type {ol.pointer.PointerEventHandler} * @type {ol.pointer.PointerEventHandler}
* @private * @private
*/ */
this.dragger_ = new _ol_pointer_PointerEventHandler_(containerElement); this.dragger_ = new PointerEventHandler(containerElement);
_ol_events_.listen(this.dragger_, PointerEventType.POINTERDOWN, _ol_events_.listen(this.dragger_, PointerEventType.POINTERDOWN,
this.handleDraggerStart_, this); this.handleDraggerStart_, this);

62
src/ol/pointer/PointerEventHandler.js
View File

@@ -47,7 +47,7 @@ import _ol_pointer_TouchSource_ from '../pointer/TouchSource.js';
* @extends {ol.events.EventTarget} * @extends {ol.events.EventTarget}
* @param {Element|HTMLDocument} element Viewport element. * @param {Element|HTMLDocument} element Viewport element.
*/ */
var _ol_pointer_PointerEventHandler_ = function(element) { var PointerEventHandler = function(element) {
EventTarget.call(this); EventTarget.call(this);
/** /**
@@ -78,14 +78,14 @@ var _ol_pointer_PointerEventHandler_ = function(element) {
this.registerSources(); this.registerSources();
}; };
inherits(_ol_pointer_PointerEventHandler_, EventTarget); inherits(PointerEventHandler, EventTarget);
/** /**
* Set up the event sources (mouse, touch and native pointers) * Set up the event sources (mouse, touch and native pointers)
* that generate pointer events. * that generate pointer events.
*/ */
_ol_pointer_PointerEventHandler_.prototype.registerSources = function() { PointerEventHandler.prototype.registerSources = function() {
if (_ol_has_.POINTER) { if (_ol_has_.POINTER) {
this.registerSource('native', new _ol_pointer_NativeSource_(this)); this.registerSource('native', new _ol_pointer_NativeSource_(this));
} else if (_ol_has_.MSPOINTER) { } else if (_ol_has_.MSPOINTER) {
@@ -111,7 +111,7 @@ _ol_pointer_PointerEventHandler_.prototype.registerSources = function() {
* @param {string} name A name for the event source * @param {string} name A name for the event source
* @param {ol.pointer.EventSource} source The source event. * @param {ol.pointer.EventSource} source The source event.
*/ */
_ol_pointer_PointerEventHandler_.prototype.registerSource = function(name, source) { PointerEventHandler.prototype.registerSource = function(name, source) {
var s = source; var s = source;
var newEvents = s.getEvents(); var newEvents = s.getEvents();
@@ -132,7 +132,7 @@ _ol_pointer_PointerEventHandler_.prototype.registerSource = function(name, sourc
* Set up the events for all registered event sources. * Set up the events for all registered event sources.
* @private * @private
*/ */
_ol_pointer_PointerEventHandler_.prototype.register_ = function() { PointerEventHandler.prototype.register_ = function() {
var l = this.eventSourceList_.length; var l = this.eventSourceList_.length;
var eventSource; var eventSource;
for (var i = 0; i < l; i++) { for (var i = 0; i < l; i++) {
@@ -146,7 +146,7 @@ _ol_pointer_PointerEventHandler_.prototype.register_ = function() {
* Remove all registered events. * Remove all registered events.
* @private * @private
*/ */
_ol_pointer_PointerEventHandler_.prototype.unregister_ = function() { PointerEventHandler.prototype.unregister_ = function() {
var l = this.eventSourceList_.length; var l = this.eventSourceList_.length;
var eventSource; var eventSource;
for (var i = 0; i < l; i++) { for (var i = 0; i < l; i++) {
@@ -161,7 +161,7 @@ _ol_pointer_PointerEventHandler_.prototype.unregister_ = function() {
* @private * @private
* @param {Event} inEvent Browser event. * @param {Event} inEvent Browser event.
*/ */
_ol_pointer_PointerEventHandler_.prototype.eventHandler_ = function(inEvent) { PointerEventHandler.prototype.eventHandler_ = function(inEvent) {
var type = inEvent.type; var type = inEvent.type;
var handler = this.eventMap_[type]; var handler = this.eventMap_[type];
if (handler) { if (handler) {
@@ -175,7 +175,7 @@ _ol_pointer_PointerEventHandler_.prototype.eventHandler_ = function(inEvent) {
* @private * @private
* @param {Array.<string>} events List of events. * @param {Array.<string>} events List of events.
*/ */
_ol_pointer_PointerEventHandler_.prototype.addEvents_ = function(events) { PointerEventHandler.prototype.addEvents_ = function(events) {
events.forEach(function(eventName) { events.forEach(function(eventName) {
_ol_events_.listen(this.element_, eventName, this.eventHandler_, this); _ol_events_.listen(this.element_, eventName, this.eventHandler_, this);
}.bind(this)); }.bind(this));
@@ -187,7 +187,7 @@ _ol_pointer_PointerEventHandler_.prototype.addEvents_ = function(events) {
* @private * @private
* @param {Array.<string>} events List of events. * @param {Array.<string>} events List of events.
*/ */
_ol_pointer_PointerEventHandler_.prototype.removeEvents_ = function(events) { PointerEventHandler.prototype.removeEvents_ = function(events) {
events.forEach(function(e) { events.forEach(function(e) {
_ol_events_.unlisten(this.element_, e, this.eventHandler_, this); _ol_events_.unlisten(this.element_, e, this.eventHandler_, this);
}.bind(this)); }.bind(this));
@@ -203,11 +203,11 @@ _ol_pointer_PointerEventHandler_.prototype.removeEvents_ = function(events) {
* @return {Object} An object containing shallow copies of * @return {Object} An object containing shallow copies of
* `inEvent`'s properties. * `inEvent`'s properties.
*/ */
_ol_pointer_PointerEventHandler_.prototype.cloneEvent = function(event, inEvent) { PointerEventHandler.prototype.cloneEvent = function(event, inEvent) {
var eventCopy = {}, p; var eventCopy = {}, p;
for (var i = 0, ii = _ol_pointer_PointerEventHandler_.CLONE_PROPS.length; i < ii; i++) { for (var i = 0, ii = PointerEventHandler.CLONE_PROPS.length; i < ii; i++) {
p = _ol_pointer_PointerEventHandler_.CLONE_PROPS[i][0]; p = PointerEventHandler.CLONE_PROPS[i][0];
eventCopy[p] = event[p] || inEvent[p] || _ol_pointer_PointerEventHandler_.CLONE_PROPS[i][1]; eventCopy[p] = event[p] || inEvent[p] || PointerEventHandler.CLONE_PROPS[i][1];
} }
return eventCopy; return eventCopy;
@@ -222,7 +222,7 @@ _ol_pointer_PointerEventHandler_.prototype.cloneEvent = function(event, inEvent)
* @param {Object} data Pointer event data. * @param {Object} data Pointer event data.
* @param {Event} event The event. * @param {Event} event The event.
*/ */
_ol_pointer_PointerEventHandler_.prototype.down = function(data, event) { PointerEventHandler.prototype.down = function(data, event) {
this.fireEvent(PointerEventType.POINTERDOWN, data, event); this.fireEvent(PointerEventType.POINTERDOWN, data, event);
}; };
@@ -232,7 +232,7 @@ _ol_pointer_PointerEventHandler_.prototype.down = function(data, event) {
* @param {Object} data Pointer event data. * @param {Object} data Pointer event data.
* @param {Event} event The event. * @param {Event} event The event.
*/ */
_ol_pointer_PointerEventHandler_.prototype.move = function(data, event) { PointerEventHandler.prototype.move = function(data, event) {
this.fireEvent(PointerEventType.POINTERMOVE, data, event); this.fireEvent(PointerEventType.POINTERMOVE, data, event);
}; };
@@ -242,7 +242,7 @@ _ol_pointer_PointerEventHandler_.prototype.move = function(data, event) {
* @param {Object} data Pointer event data. * @param {Object} data Pointer event data.
* @param {Event} event The event. * @param {Event} event The event.
*/ */
_ol_pointer_PointerEventHandler_.prototype.up = function(data, event) { PointerEventHandler.prototype.up = function(data, event) {
this.fireEvent(PointerEventType.POINTERUP, data, event); this.fireEvent(PointerEventType.POINTERUP, data, event);
}; };
@@ -252,7 +252,7 @@ _ol_pointer_PointerEventHandler_.prototype.up = function(data, event) {
* @param {Object} data Pointer event data. * @param {Object} data Pointer event data.
* @param {Event} event The event. * @param {Event} event The event.
*/ */
_ol_pointer_PointerEventHandler_.prototype.enter = function(data, event) { PointerEventHandler.prototype.enter = function(data, event) {
data.bubbles = false; data.bubbles = false;
this.fireEvent(PointerEventType.POINTERENTER, data, event); this.fireEvent(PointerEventType.POINTERENTER, data, event);
}; };
@@ -263,7 +263,7 @@ _ol_pointer_PointerEventHandler_.prototype.enter = function(data, event) {
* @param {Object} data Pointer event data. * @param {Object} data Pointer event data.
* @param {Event} event The event. * @param {Event} event The event.
*/ */
_ol_pointer_PointerEventHandler_.prototype.leave = function(data, event) { PointerEventHandler.prototype.leave = function(data, event) {
data.bubbles = false; data.bubbles = false;
this.fireEvent(PointerEventType.POINTERLEAVE, data, event); this.fireEvent(PointerEventType.POINTERLEAVE, data, event);
}; };
@@ -274,7 +274,7 @@ _ol_pointer_PointerEventHandler_.prototype.leave = function(data, event) {
* @param {Object} data Pointer event data. * @param {Object} data Pointer event data.
* @param {Event} event The event. * @param {Event} event The event.
*/ */
_ol_pointer_PointerEventHandler_.prototype.over = function(data, event) { PointerEventHandler.prototype.over = function(data, event) {
data.bubbles = true; data.bubbles = true;
this.fireEvent(PointerEventType.POINTEROVER, data, event); this.fireEvent(PointerEventType.POINTEROVER, data, event);
}; };
@@ -285,7 +285,7 @@ _ol_pointer_PointerEventHandler_.prototype.over = function(data, event) {
* @param {Object} data Pointer event data. * @param {Object} data Pointer event data.
* @param {Event} event The event. * @param {Event} event The event.
*/ */
_ol_pointer_PointerEventHandler_.prototype.out = function(data, event) { PointerEventHandler.prototype.out = function(data, event) {
data.bubbles = true; data.bubbles = true;
this.fireEvent(PointerEventType.POINTEROUT, data, event); this.fireEvent(PointerEventType.POINTEROUT, data, event);
}; };
@@ -296,7 +296,7 @@ _ol_pointer_PointerEventHandler_.prototype.out = function(data, event) {
* @param {Object} data Pointer event data. * @param {Object} data Pointer event data.
* @param {Event} event The event. * @param {Event} event The event.
*/ */
_ol_pointer_PointerEventHandler_.prototype.cancel = function(data, event) { PointerEventHandler.prototype.cancel = function(data, event) {
this.fireEvent(PointerEventType.POINTERCANCEL, data, event); this.fireEvent(PointerEventType.POINTERCANCEL, data, event);
}; };
@@ -306,7 +306,7 @@ _ol_pointer_PointerEventHandler_.prototype.cancel = function(data, event) {
* @param {Object} data Pointer event data. * @param {Object} data Pointer event data.
* @param {Event} event The event. * @param {Event} event The event.
*/ */
_ol_pointer_PointerEventHandler_.prototype.leaveOut = function(data, event) { PointerEventHandler.prototype.leaveOut = function(data, event) {
this.out(data, event); this.out(data, event);
if (!this.contains_(data.target, data.relatedTarget)) { if (!this.contains_(data.target, data.relatedTarget)) {
this.leave(data, event); this.leave(data, event);
@@ -319,7 +319,7 @@ _ol_pointer_PointerEventHandler_.prototype.leaveOut = function(data, event) {
* @param {Object} data Pointer event data. * @param {Object} data Pointer event data.
* @param {Event} event The event. * @param {Event} event The event.
*/ */
_ol_pointer_PointerEventHandler_.prototype.enterOver = function(data, event) { PointerEventHandler.prototype.enterOver = function(data, event) {
this.over(data, event); this.over(data, event);
if (!this.contains_(data.target, data.relatedTarget)) { if (!this.contains_(data.target, data.relatedTarget)) {
this.enter(data, event); this.enter(data, event);
@@ -334,7 +334,7 @@ _ol_pointer_PointerEventHandler_.prototype.enterOver = function(data, event) {
* @return {boolean} Returns true if the container element * @return {boolean} Returns true if the container element
* contains the other element. * contains the other element.
*/ */
_ol_pointer_PointerEventHandler_.prototype.contains_ = function(container, contained) { PointerEventHandler.prototype.contains_ = function(container, contained) {
if (!container || !contained) { if (!container || !contained) {
return false; return false;
} }
@@ -352,7 +352,7 @@ _ol_pointer_PointerEventHandler_.prototype.contains_ = function(container, conta
* @param {Event} event The event. * @param {Event} event The event.
* @return {ol.pointer.PointerEvent} A PointerEvent of type `inType`. * @return {ol.pointer.PointerEvent} A PointerEvent of type `inType`.
*/ */
_ol_pointer_PointerEventHandler_.prototype.makeEvent = function(inType, data, event) { PointerEventHandler.prototype.makeEvent = function(inType, data, event) {
return new _ol_pointer_PointerEvent_(inType, event, data); return new _ol_pointer_PointerEvent_(inType, event, data);
}; };
@@ -363,7 +363,7 @@ _ol_pointer_PointerEventHandler_.prototype.makeEvent = function(inType, data, ev
* @param {Object} data Pointer event data. * @param {Object} data Pointer event data.
* @param {Event} event The event. * @param {Event} event The event.
*/ */
_ol_pointer_PointerEventHandler_.prototype.fireEvent = function(inType, data, event) { PointerEventHandler.prototype.fireEvent = function(inType, data, event) {
var e = this.makeEvent(inType, data, event); var e = this.makeEvent(inType, data, event);
this.dispatchEvent(e); this.dispatchEvent(e);
}; };
@@ -374,7 +374,7 @@ _ol_pointer_PointerEventHandler_.prototype.fireEvent = function(inType, data, ev
* and dispatches this event. * and dispatches this event.
* @param {Event} event A platform event with a target. * @param {Event} event A platform event with a target.
*/ */
_ol_pointer_PointerEventHandler_.prototype.fireNativeEvent = function(event) { PointerEventHandler.prototype.fireNativeEvent = function(event) {
var e = this.makeEvent(event.type, event, event); var e = this.makeEvent(event.type, event, event);
this.dispatchEvent(e); this.dispatchEvent(e);
}; };
@@ -387,7 +387,7 @@ _ol_pointer_PointerEventHandler_.prototype.fireNativeEvent = function(event) {
* @param {Event} event The event. * @param {Event} event The event.
* @return {ol.pointer.PointerEvent} The wrapped event. * @return {ol.pointer.PointerEvent} The wrapped event.
*/ */
_ol_pointer_PointerEventHandler_.prototype.wrapMouseEvent = function(eventType, event) { PointerEventHandler.prototype.wrapMouseEvent = function(eventType, event) {
var pointerEvent = this.makeEvent( var pointerEvent = this.makeEvent(
eventType, _ol_pointer_MouseSource_.prepareEvent(event, this), event); eventType, _ol_pointer_MouseSource_.prepareEvent(event, this), event);
return pointerEvent; return pointerEvent;
@@ -397,7 +397,7 @@ _ol_pointer_PointerEventHandler_.prototype.wrapMouseEvent = function(eventType,
/** /**
* @inheritDoc * @inheritDoc
*/ */
_ol_pointer_PointerEventHandler_.prototype.disposeInternal = function() { PointerEventHandler.prototype.disposeInternal = function() {
this.unregister_(); this.unregister_();
EventTarget.prototype.disposeInternal.call(this); EventTarget.prototype.disposeInternal.call(this);
}; };
@@ -407,7 +407,7 @@ _ol_pointer_PointerEventHandler_.prototype.disposeInternal = function() {
* Properties to copy when cloning an event, with default values. * Properties to copy when cloning an event, with default values.
* @type {Array.<Array>} * @type {Array.<Array>}
*/ */
_ol_pointer_PointerEventHandler_.CLONE_PROPS = [ PointerEventHandler.CLONE_PROPS = [
// MouseEvent // MouseEvent
['bubbles', false], ['bubbles', false],
['cancelable', false], ['cancelable', false],
@@ -441,4 +441,4 @@ _ol_pointer_PointerEventHandler_.CLONE_PROPS = [
['currentTarget', null], ['currentTarget', null],
['which', 0] ['which', 0]
]; ];
export default _ol_pointer_PointerEventHandler_; export default PointerEventHandler;

4
test/spec/ol/pointer/mousesource.test.js
View File

@@ -1,7 +1,7 @@
import _ol_events_ from '../../../../src/ol/events.js'; import _ol_events_ from '../../../../src/ol/events.js';
import EventTarget from '../../../../src/ol/events/EventTarget.js'; import EventTarget from '../../../../src/ol/events/EventTarget.js';
import _ol_has_ from '../../../../src/ol/has.js'; import _ol_has_ from '../../../../src/ol/has.js';
import _ol_pointer_PointerEventHandler_ from '../../../../src/ol/pointer/PointerEventHandler.js'; import PointerEventHandler from '../../../../src/ol/pointer/PointerEventHandler.js';
import _ol_pointer_TouchSource_ from '../../../../src/ol/pointer/TouchSource.js'; import _ol_pointer_TouchSource_ from '../../../../src/ol/pointer/TouchSource.js';
@@ -20,7 +20,7 @@ describe('ol.pointer.MouseSource', function() {
_ol_has_.MSPOINTER = false; _ol_has_.MSPOINTER = false;
_ol_has_.TOUCH = true; _ol_has_.TOUCH = true;
handler = new _ol_pointer_PointerEventHandler_(target); handler = new PointerEventHandler(target);
eventSpy = sinon.spy(); eventSpy = sinon.spy();
}); });

4
test/spec/ol/pointer/pointereventhandler.test.js
View File

@@ -3,7 +3,7 @@ import EventTarget from '../../../../src/ol/events/EventTarget.js';
import _ol_has_ from '../../../../src/ol/has.js'; import _ol_has_ from '../../../../src/ol/has.js';
import _ol_pointer_MouseSource_ from '../../../../src/ol/pointer/MouseSource.js'; import _ol_pointer_MouseSource_ from '../../../../src/ol/pointer/MouseSource.js';
import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js'; import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
import _ol_pointer_PointerEventHandler_ from '../../../../src/ol/pointer/PointerEventHandler.js'; import PointerEventHandler from '../../../../src/ol/pointer/PointerEventHandler.js';
describe('ol.pointer.PointerEventHandler', function() { describe('ol.pointer.PointerEventHandler', function() {
@@ -18,7 +18,7 @@ describe('ol.pointer.PointerEventHandler', function() {
_ol_has_.POINTER = false; _ol_has_.POINTER = false;
_ol_has_.MSPOINTER = false; _ol_has_.MSPOINTER = false;
handler = new _ol_pointer_PointerEventHandler_(target); handler = new PointerEventHandler(target);
eventSpy = sinon.spy(); eventSpy = sinon.spy();
}); });

4
test/spec/ol/pointer/touchsource.test.js
View File

@@ -3,7 +3,7 @@ import Event from '../../../../src/ol/events/Event.js';
import EventTarget from '../../../../src/ol/events/EventTarget.js'; import EventTarget from '../../../../src/ol/events/EventTarget.js';
import _ol_has_ from '../../../../src/ol/has.js'; import _ol_has_ from '../../../../src/ol/has.js';
import _ol_obj_ from '../../../../src/ol/obj.js'; import _ol_obj_ from '../../../../src/ol/obj.js';
import _ol_pointer_PointerEventHandler_ from '../../../../src/ol/pointer/PointerEventHandler.js'; import PointerEventHandler from '../../../../src/ol/pointer/PointerEventHandler.js';
describe('ol.pointer.TouchSource', function() { describe('ol.pointer.TouchSource', function() {
var handler; var handler;
var target; var target;
@@ -17,7 +17,7 @@ describe('ol.pointer.TouchSource', function() {
_ol_has_.MSPOINTER = false; _ol_has_.MSPOINTER = false;
_ol_has_.TOUCH = true; _ol_has_.TOUCH = true;
handler = new _ol_pointer_PointerEventHandler_(target); handler = new PointerEventHandler(target);
eventSpy = sinon.spy(); eventSpy = sinon.spy();
}); });