Transformed
This commit is contained in:
@@ -1,10 +1,8 @@
|
||||
|
||||
|
||||
goog.require('ol.events');
|
||||
goog.require('ol.events.EventTarget');
|
||||
goog.require('ol.has');
|
||||
goog.require('ol.pointer.PointerEventHandler');
|
||||
goog.require('ol.pointer.TouchSource');
|
||||
import _ol_events_ from '../../../../src/ol/events.js';
|
||||
import _ol_events_EventTarget_ from '../../../../src/ol/events/EventTarget.js';
|
||||
import _ol_has_ from '../../../../src/ol/has.js';
|
||||
import _ol_pointer_PointerEventHandler_ from '../../../../src/ol/pointer/PointerEventHandler.js';
|
||||
import _ol_pointer_TouchSource_ from '../../../../src/ol/pointer/TouchSource.js';
|
||||
|
||||
|
||||
describe('ol.pointer.MouseSource', function() {
|
||||
@@ -15,14 +13,14 @@ describe('ol.pointer.MouseSource', function() {
|
||||
|
||||
beforeEach(function() {
|
||||
clock = sinon.useFakeTimers();
|
||||
target = new ol.events.EventTarget();
|
||||
target = new _ol_events_EventTarget_();
|
||||
|
||||
// make sure that a mouse and touch event source is used
|
||||
ol.has.POINTER = false;
|
||||
ol.has.MSPOINTER = false;
|
||||
ol.has.TOUCH = true;
|
||||
_ol_has_.POINTER = false;
|
||||
_ol_has_.MSPOINTER = false;
|
||||
_ol_has_.TOUCH = true;
|
||||
|
||||
handler = new ol.pointer.PointerEventHandler(target);
|
||||
handler = new _ol_pointer_PointerEventHandler_(target);
|
||||
eventSpy = sinon.spy();
|
||||
});
|
||||
|
||||
@@ -33,7 +31,7 @@ describe('ol.pointer.MouseSource', function() {
|
||||
|
||||
describe('simulated mouse events', function() {
|
||||
it('prevents simulated mouse events', function() {
|
||||
ol.events.listen(handler, 'pointerdown', eventSpy);
|
||||
_ol_events_.listen(handler, 'pointerdown', eventSpy);
|
||||
|
||||
// simulates that a mouse event is triggered from a touch
|
||||
simulateTouchEvent('touchstart', 10, 20);
|
||||
@@ -44,7 +42,7 @@ describe('ol.pointer.MouseSource', function() {
|
||||
});
|
||||
|
||||
it('dispatches real mouse events', function() {
|
||||
ol.events.listen(handler, 'pointerdown', eventSpy);
|
||||
_ol_events_.listen(handler, 'pointerdown', eventSpy);
|
||||
|
||||
// the two events are at different positions
|
||||
simulateTouchEvent('touchstart', 10, 20);
|
||||
@@ -55,9 +53,9 @@ describe('ol.pointer.MouseSource', function() {
|
||||
|
||||
it('dispatches real mouse events after timeout', function() {
|
||||
// set the timeout to a lower value, to speed up the tests
|
||||
ol.pointer.TouchSource.DEDUP_TIMEOUT = 100;
|
||||
_ol_pointer_TouchSource_.DEDUP_TIMEOUT = 100;
|
||||
|
||||
ol.events.listen(handler, 'pointerdown', eventSpy);
|
||||
_ol_events_.listen(handler, 'pointerdown', eventSpy);
|
||||
|
||||
// first simulate a touch event, then a mouse event
|
||||
// at the same position after a timeout
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
|
||||
|
||||
goog.require('ol.events');
|
||||
goog.require('ol.events.EventTarget');
|
||||
goog.require('ol.has');
|
||||
goog.require('ol.pointer.MouseSource');
|
||||
goog.require('ol.pointer.PointerEvent');
|
||||
goog.require('ol.pointer.PointerEventHandler');
|
||||
import _ol_events_ from '../../../../src/ol/events.js';
|
||||
import _ol_events_EventTarget_ from '../../../../src/ol/events/EventTarget.js';
|
||||
import _ol_has_ from '../../../../src/ol/has.js';
|
||||
import _ol_pointer_MouseSource_ from '../../../../src/ol/pointer/MouseSource.js';
|
||||
import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
|
||||
import _ol_pointer_PointerEventHandler_ from '../../../../src/ol/pointer/PointerEventHandler.js';
|
||||
|
||||
|
||||
describe('ol.pointer.PointerEventHandler', function() {
|
||||
@@ -14,13 +12,13 @@ describe('ol.pointer.PointerEventHandler', function() {
|
||||
var eventSpy;
|
||||
|
||||
beforeEach(function() {
|
||||
target = new ol.events.EventTarget();
|
||||
target = new _ol_events_EventTarget_();
|
||||
|
||||
// make sure that a mouse event source is used
|
||||
ol.has.POINTER = false;
|
||||
ol.has.MSPOINTER = false;
|
||||
_ol_has_.POINTER = false;
|
||||
_ol_has_.MSPOINTER = false;
|
||||
|
||||
handler = new ol.pointer.PointerEventHandler(target);
|
||||
handler = new _ol_pointer_PointerEventHandler_(target);
|
||||
eventSpy = sinon.spy();
|
||||
});
|
||||
|
||||
@@ -32,7 +30,7 @@ describe('ol.pointer.PointerEventHandler', function() {
|
||||
describe('constructor', function() {
|
||||
it('registers a least one event source', function() {
|
||||
expect(handler.eventSourceList_.length).to.be.greaterThan(0);
|
||||
expect(handler.eventSourceList_[0]).to.be.a(ol.pointer.MouseSource);
|
||||
expect(handler.eventSourceList_[0]).to.be.a(_ol_pointer_MouseSource_);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -48,12 +46,12 @@ describe('ol.pointer.PointerEventHandler', function() {
|
||||
|
||||
describe('pointer down', function() {
|
||||
it('fires pointerdown events', function() {
|
||||
ol.events.listen(handler, 'pointerdown', eventSpy);
|
||||
_ol_events_.listen(handler, 'pointerdown', eventSpy);
|
||||
simulateEvent('mousedown', 0, 0);
|
||||
expect(eventSpy.calledOnce).to.be.ok();
|
||||
|
||||
var pointerEvent = eventSpy.firstCall.args[0];
|
||||
expect(pointerEvent).to.be.a(ol.pointer.PointerEvent);
|
||||
expect(pointerEvent).to.be.a(_ol_pointer_PointerEvent_);
|
||||
expect(pointerEvent.type).to.be('pointerdown');
|
||||
expect(pointerEvent.pointerId).to.be(1);
|
||||
expect(pointerEvent.pointerType).to.be('mouse');
|
||||
@@ -62,7 +60,7 @@ describe('ol.pointer.PointerEventHandler', function() {
|
||||
|
||||
describe('pointer up', function() {
|
||||
it('fires pointerup events', function() {
|
||||
ol.events.listen(handler, 'pointerup', eventSpy);
|
||||
_ol_events_.listen(handler, 'pointerup', eventSpy);
|
||||
simulateEvent('mousedown', 0, 0);
|
||||
simulateEvent('mouseup', 0, 0);
|
||||
expect(eventSpy.calledOnce).to.be.ok();
|
||||
@@ -71,7 +69,7 @@ describe('ol.pointer.PointerEventHandler', function() {
|
||||
|
||||
describe('pointer move', function() {
|
||||
it('fires pointermove events', function() {
|
||||
ol.events.listen(handler, 'pointermove', eventSpy);
|
||||
_ol_events_.listen(handler, 'pointermove', eventSpy);
|
||||
simulateEvent('mousemove', 0, 0);
|
||||
expect(eventSpy.calledOnce).to.be.ok();
|
||||
});
|
||||
@@ -82,8 +80,8 @@ describe('ol.pointer.PointerEventHandler', function() {
|
||||
var enterEventSpy = sinon.spy();
|
||||
var overEventSpy = sinon.spy();
|
||||
|
||||
ol.events.listen(handler, 'pointerenter', enterEventSpy);
|
||||
ol.events.listen(handler, 'pointerover', overEventSpy);
|
||||
_ol_events_.listen(handler, 'pointerenter', enterEventSpy);
|
||||
_ol_events_.listen(handler, 'pointerover', overEventSpy);
|
||||
|
||||
simulateEvent('mouseover', 0, 0);
|
||||
|
||||
@@ -97,8 +95,8 @@ describe('ol.pointer.PointerEventHandler', function() {
|
||||
var leaveEventSpy = sinon.spy();
|
||||
var outEventSpy = sinon.spy();
|
||||
|
||||
ol.events.listen(handler, 'pointerleave', leaveEventSpy);
|
||||
ol.events.listen(handler, 'pointerout', outEventSpy);
|
||||
_ol_events_.listen(handler, 'pointerleave', leaveEventSpy);
|
||||
_ol_events_.listen(handler, 'pointerout', outEventSpy);
|
||||
|
||||
simulateEvent('mouseout', 0, 0);
|
||||
|
||||
@@ -162,7 +160,7 @@ describe('ol.pointer.PointerEventHandler', function() {
|
||||
|
||||
expect(pointerEvent.preventDefault).to.be.ok();
|
||||
|
||||
expect(pointerEvent).to.be.a(ol.pointer.PointerEvent);
|
||||
expect(pointerEvent).to.be.a(_ol_pointer_PointerEvent_);
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -1,25 +1,23 @@
|
||||
|
||||
|
||||
goog.require('ol.events');
|
||||
goog.require('ol.events.Event');
|
||||
goog.require('ol.events.EventTarget');
|
||||
goog.require('ol.has');
|
||||
goog.require('ol.obj');
|
||||
goog.require('ol.pointer.PointerEventHandler');
|
||||
import _ol_events_ from '../../../../src/ol/events.js';
|
||||
import _ol_events_Event_ from '../../../../src/ol/events/Event.js';
|
||||
import _ol_events_EventTarget_ from '../../../../src/ol/events/EventTarget.js';
|
||||
import _ol_has_ from '../../../../src/ol/has.js';
|
||||
import _ol_obj_ from '../../../../src/ol/obj.js';
|
||||
import _ol_pointer_PointerEventHandler_ from '../../../../src/ol/pointer/PointerEventHandler.js';
|
||||
describe('ol.pointer.TouchSource', function() {
|
||||
var handler;
|
||||
var target;
|
||||
var eventSpy;
|
||||
|
||||
beforeEach(function() {
|
||||
target = new ol.events.EventTarget();
|
||||
target = new _ol_events_EventTarget_();
|
||||
|
||||
// make sure that a mouse and touch event source is used
|
||||
ol.has.POINTER = false;
|
||||
ol.has.MSPOINTER = false;
|
||||
ol.has.TOUCH = true;
|
||||
_ol_has_.POINTER = false;
|
||||
_ol_has_.MSPOINTER = false;
|
||||
_ol_has_.TOUCH = true;
|
||||
|
||||
handler = new ol.pointer.PointerEventHandler(target);
|
||||
handler = new _ol_pointer_PointerEventHandler_(target);
|
||||
eventSpy = sinon.spy();
|
||||
});
|
||||
|
||||
@@ -29,7 +27,7 @@ describe('ol.pointer.TouchSource', function() {
|
||||
|
||||
describe('pointer event creation', function() {
|
||||
it('generates pointer events for each touch contact', function() {
|
||||
ol.events.listen(handler, 'pointerdown', eventSpy);
|
||||
_ol_events_.listen(handler, 'pointerdown', eventSpy);
|
||||
|
||||
simulateTouchEvent('touchstart', [
|
||||
{identifier: 3, clientX: 10, clientY: 11},
|
||||
@@ -56,7 +54,7 @@ describe('ol.pointer.TouchSource', function() {
|
||||
});
|
||||
|
||||
it('creates the right pointer events', function() {
|
||||
ol.events.listen(handler, 'pointerdown', eventSpy);
|
||||
_ol_events_.listen(handler, 'pointerdown', eventSpy);
|
||||
|
||||
// first touch
|
||||
simulateTouchEvent('touchstart', [
|
||||
@@ -75,7 +73,7 @@ describe('ol.pointer.TouchSource', function() {
|
||||
|
||||
// first touch moves
|
||||
var moveEventSpy = sinon.spy();
|
||||
ol.events.listen(handler, 'pointermove', moveEventSpy);
|
||||
_ol_events_.listen(handler, 'pointermove', moveEventSpy);
|
||||
|
||||
simulateTouchEvent('touchmove', [
|
||||
{identifier: 3, clientX: 15, clientY: 16}
|
||||
@@ -85,7 +83,7 @@ describe('ol.pointer.TouchSource', function() {
|
||||
|
||||
// and then both touches go up
|
||||
var upEventSpy = sinon.spy();
|
||||
ol.events.listen(handler, 'pointerup', upEventSpy);
|
||||
_ol_events_.listen(handler, 'pointerup', upEventSpy);
|
||||
|
||||
simulateTouchEvent('touchend', [
|
||||
{identifier: 3, clientX: 15, clientY: 16},
|
||||
@@ -97,7 +95,7 @@ describe('ol.pointer.TouchSource', function() {
|
||||
});
|
||||
|
||||
it('handles flawed touches', function() {
|
||||
ol.events.listen(handler, 'pointerdown', eventSpy);
|
||||
_ol_events_.listen(handler, 'pointerdown', eventSpy);
|
||||
|
||||
// first touch
|
||||
simulateTouchEvent('touchstart', [
|
||||
@@ -108,7 +106,7 @@ describe('ol.pointer.TouchSource', function() {
|
||||
|
||||
// second touch, but the first touch has disappeared
|
||||
var cancelEventSpy = sinon.spy();
|
||||
ol.events.listen(handler, 'pointercancel', cancelEventSpy);
|
||||
_ol_events_.listen(handler, 'pointercancel', cancelEventSpy);
|
||||
simulateTouchEvent('touchstart', [
|
||||
{identifier: 4, clientX: 30, clientY: 45}
|
||||
], [{identifier: 4}]
|
||||
@@ -124,8 +122,8 @@ describe('ol.pointer.TouchSource', function() {
|
||||
function simulateTouchEvent(type, changedTouches, touches) {
|
||||
touches = touches !== undefined ? touches : changedTouches;
|
||||
|
||||
var event = new ol.events.Event(type);
|
||||
ol.obj.assign(event, {
|
||||
var event = new _ol_events_Event_(type);
|
||||
_ol_obj_.assign(event, {
|
||||
touches: touches,
|
||||
changedTouches: changedTouches
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user