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

6
test/spec/ol/events.test.js
View File

@@ -1,5 +1,5 @@
import _ol_events_ from '../../../src/ol/events.js';
import _ol_events_EventTarget_ from '../../../src/ol/events/EventTarget.js';
import EventTarget from '../../../src/ol/events/EventTarget.js';
describe('ol.events', function() {
var add, remove, target;
@@ -199,7 +199,7 @@ describe('ol.events', function() {
describe('Compatibility with ol.events.EventTarget', function() {
it('does not register duplicated listeners', function() {
var target = new _ol_events_EventTarget_();
var target = new EventTarget();
var listener = function() {};
var key1 = _ol_events_.listen(target, 'foo', listener);
expect(target.getListeners('foo')).to.eql([key1.boundListener]);
@@ -208,7 +208,7 @@ describe('ol.events', function() {
expect(target.getListeners('foo')).to.eql([key1.boundListener]);
});
it('registers multiple listeners if this object is different', function() {
var target = new _ol_events_EventTarget_();
var target = new EventTarget();
var listener = function() {};
var key1 = _ol_events_.listen(target, 'foo', listener, {});
var key2 = _ol_events_.listen(target, 'foo', listener, {});

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

@@ -1,7 +1,7 @@
import _ol_Disposable_ from '../../../../src/ol/Disposable.js';
import _ol_events_ from '../../../../src/ol/events.js';
import Event from '../../../../src/ol/events/Event.js';
import _ol_events_EventTarget_ from '../../../../src/ol/events/EventTarget.js';
import EventTarget from '../../../../src/ol/events/EventTarget.js';
describe('ol.events.EventTarget', function() {
@@ -17,12 +17,12 @@ describe('ol.events.EventTarget', function() {
spy1 = spy.bind({id: 1});
spy2 = spy.bind({id: 2});
spy3 = spy.bind({id: 3});
eventTarget = new _ol_events_EventTarget_();
eventTarget = new EventTarget();
});
describe('constructor', function() {
it('creates an instance', function() {
expect(eventTarget).to.be.a(_ol_events_EventTarget_);
expect(eventTarget).to.be.a(EventTarget);
expect(eventTarget).to.be.a(_ol_Disposable_);
});
it('creates an empty listeners_ object', function() {

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

@@ -1,7 +1,7 @@
import {inherits} from '../../../../src/ol/index.js';
import _ol_View_ from '../../../../src/ol/View.js';
import Event from '../../../../src/ol/events/Event.js';
import _ol_events_EventTarget_ from '../../../../src/ol/events/EventTarget.js';
import 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';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
@@ -10,7 +10,7 @@ where('FileReader').describe('ol.interaction.DragAndDrop', function() {
var viewport, map, interaction;
beforeEach(function() {
viewport = new _ol_events_EventTarget_();
viewport = new EventTarget();
map = {
getViewport: function() {
return viewport;
@@ -72,7 +72,7 @@ where('FileReader').describe('ol.interaction.DragAndDrop', function() {
});
it('registers and unregisters listeners on a custom target', function() {
var customTarget = new _ol_events_EventTarget_();
var customTarget = new EventTarget();
interaction = new _ol_interaction_DragAndDrop_({
formatConstructors: [_ol_format_GeoJSON_],
target: customTarget
@@ -95,13 +95,13 @@ where('FileReader').describe('ol.interaction.DragAndDrop', function() {
OrigFileReader = FileReader;
FileReader = function() {
_ol_events_EventTarget_.apply(this, arguments);
EventTarget.apply(this, arguments);
this.readAsText = function(file) {
this.result = file;
this.dispatchEvent('load');
};
};
inherits(FileReader, _ol_events_EventTarget_);
inherits(FileReader, EventTarget);
});
afterEach(function() {

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

@@ -1,6 +1,6 @@
import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_View_ from '../../../../src/ol/View.js';
import _ol_events_EventTarget_ from '../../../../src/ol/events/EventTarget.js';
import EventTarget from '../../../../src/ol/events/EventTarget.js';
import _ol_interaction_Interaction_ from '../../../../src/ol/interaction/Interaction.js';
describe('ol.interaction.Interaction', function() {
@@ -14,7 +14,7 @@ describe('ol.interaction.Interaction', function() {
it('creates a new interaction', function() {
expect(interaction).to.be.a(_ol_interaction_Interaction_);
expect(interaction).to.be.a(_ol_events_EventTarget_);
expect(interaction).to.be.a(EventTarget);
});
it('creates an active interaction', function() {

4
test/spec/ol/observable.test.js
View File

@@ -1,4 +1,4 @@
import _ol_events_EventTarget_ from '../../../src/ol/events/EventTarget.js';
import EventTarget from '../../../src/ol/events/EventTarget.js';
import _ol_Observable_ from '../../../src/ol/Observable.js';
@@ -9,7 +9,7 @@ describe('ol.Observable', function() {
it('creates a new observable', function() {
var observable = new _ol_Observable_();
expect(observable).to.be.a(_ol_Observable_);
expect(observable).to.be.a(_ol_events_EventTarget_);
expect(observable).to.be.a(EventTarget);
});
});

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

@@ -1,5 +1,5 @@
import _ol_events_ from '../../../../src/ol/events.js';
import _ol_events_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_pointer_PointerEventHandler_ from '../../../../src/ol/pointer/PointerEventHandler.js';
import _ol_pointer_TouchSource_ from '../../../../src/ol/pointer/TouchSource.js';
@@ -13,7 +13,7 @@ describe('ol.pointer.MouseSource', function() {
beforeEach(function() {
clock = sinon.useFakeTimers();
target = new _ol_events_EventTarget_();
target = new EventTarget();
// make sure that a mouse and touch event source is used
_ol_has_.POINTER = false;

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

@@ -1,5 +1,5 @@
import _ol_events_ from '../../../../src/ol/events.js';
import _ol_events_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_pointer_MouseSource_ from '../../../../src/ol/pointer/MouseSource.js';
import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
@@ -12,7 +12,7 @@ describe('ol.pointer.PointerEventHandler', function() {
var eventSpy;
beforeEach(function() {
target = new _ol_events_EventTarget_();
target = new EventTarget();
// make sure that a mouse event source is used
_ol_has_.POINTER = false;

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

@@ -1,6 +1,6 @@
import _ol_events_ from '../../../../src/ol/events.js';
import Event from '../../../../src/ol/events/Event.js';
import _ol_events_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_obj_ from '../../../../src/ol/obj.js';
import _ol_pointer_PointerEventHandler_ from '../../../../src/ol/pointer/PointerEventHandler.js';
@@ -10,7 +10,7 @@ describe('ol.pointer.TouchSource', function() {
var eventSpy;
beforeEach(function() {
target = new _ol_events_EventTarget_();
target = new EventTarget();
// make sure that a mouse and touch event source is used
_ol_has_.POINTER = false;