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

Rename _ol_events_Event_ to Event

Browse Source
This commit is contained in:
Marc Jansen
2017-12-15 09:37:05 +01:00
committed by Frederic Junod
parent 9622c64bc6
commit 1cc682e488
27 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/spec/ol/events/event.test.js
View File

@@ -1,26 +1,26 @@
import _ol_events_Event_ from '../../../../src/ol/events/Event.js';
import Event from '../../../../src/ol/events/Event.js';
describe('ol.events.Event', function() {
describe('constructor', function() {
it('takes a type as argument', function() {
var event = new _ol_events_Event_('foo');
var event = new Event('foo');
expect(event.type).to.be('foo');
});
it('does not set the propagationStopped flag', function() {
var event = new _ol_events_Event_('foo');
var event = new Event('foo');
expect(event.propagationStopped).to.be(undefined);
});
});
describe('#preventDefault', function() {
it('sets the propagationStopped flag', function() {
var event = new _ol_events_Event_('foo');
var event = new Event('foo');
event.preventDefault();
expect(event.propagationStopped).to.be(true);
});
it('is the same as #stopPropagation', function() {
var event = new _ol_events_Event_('foo');
var event = new Event('foo');
expect(event.stopPropagation).to.equal(event.preventDefault);
});
});
@@ -30,7 +30,7 @@ describe('ol.events.Event', function() {
var event = {
preventDefault: sinon.spy()
};
_ol_events_Event_.preventDefault(event);
Event.preventDefault(event);
expect(event.preventDefault.called).to.be(true);
});
});
@@ -40,7 +40,7 @@ describe('ol.events.Event', function() {
var event = {
stopPropagation: sinon.spy()
};
_ol_events_Event_.stopPropagation(event);
Event.stopPropagation(event);
expect(event.stopPropagation.called).to.be(true);
});
});

4
test/spec/ol/events/eventtarget.test.js
View File

@@ -1,6 +1,6 @@
import _ol_Disposable_ from '../../../../src/ol/Disposable.js';
import _ol_events_ from '../../../../src/ol/events.js';
import _ol_events_Event_ from '../../../../src/ol/events/Event.js';
import Event from '../../../../src/ol/events/Event.js';
import _ol_events_EventTarget_ from '../../../../src/ol/events/EventTarget.js';
@@ -105,7 +105,7 @@ describe('ol.events.EventTarget', function() {
it('passes a default ol.events.Event object to listeners', function() {
eventTarget.addEventListener('foo', spy1);
eventTarget.dispatchEvent('foo');
expect(events[0]).to.be.a(_ol_events_Event_);
expect(events[0]).to.be.a(Event);
expect(events[0].type).to.be('foo');
expect(events[0].target).to.equal(eventTarget);
});

6
test/spec/ol/interaction/draganddrop.test.js
View File

@@ -1,6 +1,6 @@
import {inherits} from '../../../../src/ol/index.js';
import _ol_View_ from '../../../../src/ol/View.js';
import _ol_events_Event_ from '../../../../src/ol/events/Event.js';
import Event from '../../../../src/ol/events/Event.js';
import _ol_events_EventTarget_ from '../../../../src/ol/events/EventTarget.js';
import _ol_format_GeoJSON_ from '../../../../src/ol/format/GeoJSON.js';
import _ol_interaction_DragAndDrop_ from '../../../../src/ol/interaction/DragAndDrop.js';
@@ -114,7 +114,7 @@ where('FileReader').describe('ol.interaction.DragAndDrop', function() {
done();
});
interaction.setMap(map);
var event = new _ol_events_Event_();
var event = new Event();
event.dataTransfer = {};
event.type = 'dragenter';
viewport.dispatchEvent(event);
@@ -149,7 +149,7 @@ where('FileReader').describe('ol.interaction.DragAndDrop', function() {
done();
});
var event = new _ol_events_Event_();
var event = new Event();
event.dataTransfer = {};
event.type = 'dragenter';
viewport.dispatchEvent(event);

4
test/spec/ol/interaction/keyboardpan.test.js
View File

@@ -1,7 +1,7 @@
import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_MapBrowserEvent_ from '../../../../src/ol/MapBrowserEvent.js';
import _ol_View_ from '../../../../src/ol/View.js';
import _ol_events_Event_ from '../../../../src/ol/events/Event.js';
import Event from '../../../../src/ol/events/Event.js';
import _ol_interaction_Interaction_ from '../../../../src/ol/interaction/Interaction.js';
describe('ol.interaction.KeyboardPan', function() {
var map;
@@ -27,7 +27,7 @@ describe('ol.interaction.KeyboardPan', function() {
var event = new _ol_MapBrowserEvent_('keydown', map, {
type: 'keydown',
target: map.getTargetElement(),
preventDefault: _ol_events_Event_.prototype.preventDefault
preventDefault: Event.prototype.preventDefault
});
event.originalEvent.keyCode = 40; // DOWN
map.handleMapBrowserEvent(event);

4
test/spec/ol/interaction/keyboardzoom.test.js
View File

@@ -1,7 +1,7 @@
import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_MapBrowserEvent_ from '../../../../src/ol/MapBrowserEvent.js';
import _ol_View_ from '../../../../src/ol/View.js';
import _ol_events_Event_ from '../../../../src/ol/events/Event.js';
import Event from '../../../../src/ol/events/Event.js';
import _ol_interaction_Interaction_ from '../../../../src/ol/interaction/Interaction.js';
describe('ol.interaction.KeyboardZoom', function() {
var map;
@@ -27,7 +27,7 @@ describe('ol.interaction.KeyboardZoom', function() {
var event = new _ol_MapBrowserEvent_('keydown', map, {
type: 'keydown',
target: map.getTargetElement(),
preventDefault: _ol_events_Event_.prototype.preventDefault
preventDefault: Event.prototype.preventDefault
});
event.originalEvent.charCode = '+'.charCodeAt(0);
map.handleMapBrowserEvent(event);

14
test/spec/ol/interaction/mousewheelzoom.test.js
View File

@@ -1,7 +1,7 @@
import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_MapBrowserEvent_ from '../../../../src/ol/MapBrowserEvent.js';
import _ol_View_ from '../../../../src/ol/View.js';
import _ol_events_Event_ from '../../../../src/ol/events/Event.js';
import Event from '../../../../src/ol/events/Event.js';
import _ol_has_ from '../../../../src/ol/has.js';
import _ol_interaction_Interaction_ from '../../../../src/ol/interaction/Interaction.js';
import _ol_interaction_MouseWheelZoom_ from '../../../../src/ol/interaction/MouseWheelZoom.js';
@@ -46,7 +46,7 @@ describe('ol.interaction.MouseWheelZoom', function() {
var event = new _ol_MapBrowserEvent_('mousewheel', map, {
type: 'mousewheel',
target: map.getViewport(),
preventDefault: _ol_events_Event_.prototype.preventDefault
preventDefault: Event.prototype.preventDefault
});
map.handleMapBrowserEvent(event);
clock.tick(50);
@@ -75,7 +75,7 @@ describe('ol.interaction.MouseWheelZoom', function() {
deltaMode: WheelEvent.DOM_DELTA_PIXEL,
deltaY: _ol_has_.DEVICE_PIXEL_RATIO,
target: map.getViewport(),
preventDefault: _ol_events_Event_.prototype.preventDefault
preventDefault: Event.prototype.preventDefault
});
event.coordinate = [0, 0];
map.handleMapBrowserEvent(event);
@@ -94,7 +94,7 @@ describe('ol.interaction.MouseWheelZoom', function() {
deltaMode: WheelEvent.DOM_DELTA_PIXEL,
deltaY: 1,
target: map.getViewport(),
preventDefault: _ol_events_Event_.prototype.preventDefault
preventDefault: Event.prototype.preventDefault
});
event.coordinate = [0, 0];
map.handleMapBrowserEvent(event);
@@ -120,7 +120,7 @@ describe('ol.interaction.MouseWheelZoom', function() {
deltaMode: WheelEvent.DOM_DELTA_LINE,
deltaY: 3.714599609375,
target: map.getViewport(),
preventDefault: _ol_events_Event_.prototype.preventDefault
preventDefault: Event.prototype.preventDefault
});
event.coordinate = [0, 0];
map.handleMapBrowserEvent(event);
@@ -140,7 +140,7 @@ describe('ol.interaction.MouseWheelZoom', function() {
type: 'mousewheel',
wheelDeltaY: -50,
target: map.getViewport(),
preventDefault: _ol_events_Event_.prototype.preventDefault
preventDefault: Event.prototype.preventDefault
});
event.coordinate = [0, 0];
map.handleMapBrowserEvent(event);
@@ -160,7 +160,7 @@ describe('ol.interaction.MouseWheelZoom', function() {
type: 'mousewheel',
wheelDeltaY: -120,
target: map.getViewport(),
preventDefault: _ol_events_Event_.prototype.preventDefault
preventDefault: Event.prototype.preventDefault
});
event.coordinate = [0, 0];
map.handleMapBrowserEvent(event);

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

@@ -1,5 +1,5 @@
import _ol_events_ from '../../../../src/ol/events.js';
import _ol_events_Event_ from '../../../../src/ol/events/Event.js';
import 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';
@@ -122,7 +122,7 @@ describe('ol.pointer.TouchSource', function() {
function simulateTouchEvent(type, changedTouches, touches) {
touches = touches !== undefined ? touches : changedTouches;
var event = new _ol_events_Event_(type);
var event = new Event(type);
_ol_obj_.assign(event, {
touches: touches,
changedTouches: changedTouches