Replace goog.events.Event/EventTarget system with our own
This also removes goog.events.listen, goog.events.unlisten, goog.events.unlistenByKey and goog.events.BrowserEvent.
This commit is contained in:
@@ -124,7 +124,7 @@ describe('ol.source.TileImage', function() {
|
||||
var tile = source.getTile(0, 0, -1, 1, ol.proj.get('EPSG:3857'));
|
||||
expect(tile).to.be.a(ol.reproj.Tile);
|
||||
|
||||
tile.listen('change', function() {
|
||||
ol.events.listen(tile, 'change', function() {
|
||||
if (tile.getState() == ol.TileState.LOADED) {
|
||||
done();
|
||||
}
|
||||
@@ -143,7 +143,7 @@ describe('ol.source.TileImage', function() {
|
||||
var tile = source.getTile(0, 0, -1, 1, proj);
|
||||
expect(tile).to.be.a(ol.reproj.Tile);
|
||||
|
||||
tile.listen('change', function() {
|
||||
ol.events.listen(tile, 'change', function() {
|
||||
if (tile.getState() == ol.TileState.LOADED) {
|
||||
done();
|
||||
}
|
||||
@@ -157,6 +157,7 @@ goog.require('ol.ImageTile');
|
||||
goog.require('ol.Tile');
|
||||
goog.require('ol.TileState');
|
||||
goog.require('ol.TileUrlFunction');
|
||||
goog.require('ol.events');
|
||||
goog.require('ol.proj');
|
||||
goog.require('ol.proj.Projection');
|
||||
goog.require('ol.reproj.Tile');
|
||||
|
||||
@@ -11,7 +11,7 @@ describe('ol.source.TileJSON', function() {
|
||||
var source = new ol.source.TileJSON({
|
||||
url: 'invalid.jsonp'
|
||||
});
|
||||
goog.events.listen(source, 'change', changeSpy);
|
||||
ol.events.listen(source, 'change', changeSpy);
|
||||
});
|
||||
|
||||
});
|
||||
@@ -73,7 +73,7 @@ describe('ol.source.TileJSON', function() {
|
||||
|
||||
});
|
||||
|
||||
goog.require('goog.events');
|
||||
goog.require('ol.events');
|
||||
goog.require('ol.source.State');
|
||||
goog.require('ol.source.TileJSON');
|
||||
goog.require('ol.Observable');
|
||||
|
||||
@@ -57,7 +57,7 @@ describe('ol.source.Vector', function() {
|
||||
|
||||
it('fires a change event', function() {
|
||||
var listener = sinon.spy();
|
||||
goog.events.listen(vectorSource, 'change', listener);
|
||||
ol.events.listen(vectorSource, 'change', listener);
|
||||
vectorSource.addFeature(pointFeature);
|
||||
expect(listener).to.be.called();
|
||||
});
|
||||
@@ -98,11 +98,11 @@ describe('ol.source.Vector', function() {
|
||||
|
||||
it('removes all features using fast path', function() {
|
||||
var changeSpy = sinon.spy();
|
||||
goog.events.listen(vectorSource, 'change', changeSpy);
|
||||
ol.events.listen(vectorSource, 'change', changeSpy);
|
||||
var removeFeatureSpy = sinon.spy();
|
||||
goog.events.listen(vectorSource, 'removefeature', removeFeatureSpy);
|
||||
ol.events.listen(vectorSource, 'removefeature', removeFeatureSpy);
|
||||
var clearSourceSpy = sinon.spy();
|
||||
goog.events.listen(vectorSource, 'clear', clearSourceSpy);
|
||||
ol.events.listen(vectorSource, 'clear', clearSourceSpy);
|
||||
vectorSource.clear(true);
|
||||
expect(vectorSource.getFeatures()).to.eql([]);
|
||||
expect(vectorSource.isEmpty()).to.be(true);
|
||||
@@ -116,11 +116,11 @@ describe('ol.source.Vector', function() {
|
||||
|
||||
it('removes all features using slow path', function() {
|
||||
var changeSpy = sinon.spy();
|
||||
goog.events.listen(vectorSource, 'change', changeSpy);
|
||||
ol.events.listen(vectorSource, 'change', changeSpy);
|
||||
var removeFeatureSpy = sinon.spy();
|
||||
goog.events.listen(vectorSource, 'removefeature', removeFeatureSpy);
|
||||
ol.events.listen(vectorSource, 'removefeature', removeFeatureSpy);
|
||||
var clearSourceSpy = sinon.spy();
|
||||
goog.events.listen(vectorSource, 'clear', clearSourceSpy);
|
||||
ol.events.listen(vectorSource, 'clear', clearSourceSpy);
|
||||
vectorSource.clear();
|
||||
expect(vectorSource.getFeatures()).to.eql([]);
|
||||
expect(vectorSource.isEmpty()).to.be(true);
|
||||
@@ -184,7 +184,7 @@ describe('ol.source.Vector', function() {
|
||||
|
||||
it('fires a change event', function() {
|
||||
var listener = sinon.spy();
|
||||
goog.events.listen(vectorSource, 'change', listener);
|
||||
ol.events.listen(vectorSource, 'change', listener);
|
||||
vectorSource.removeFeature(features[0]);
|
||||
expect(listener).to.be.called();
|
||||
});
|
||||
@@ -270,7 +270,7 @@ describe('ol.source.Vector', function() {
|
||||
var feature = new ol.Feature(new ol.geom.Point([1, 1]));
|
||||
vectorSource.addFeature(feature);
|
||||
var listener = sinon.spy();
|
||||
goog.events.listen(vectorSource, 'change', listener);
|
||||
ol.events.listen(vectorSource, 'change', listener);
|
||||
feature.set('foo', 'bar');
|
||||
expect(listener).to.be.called();
|
||||
});
|
||||
@@ -554,7 +554,7 @@ describe('ol.source.Vector', function() {
|
||||
});
|
||||
|
||||
|
||||
goog.require('goog.events');
|
||||
goog.require('ol.events');
|
||||
goog.require('ol.Collection');
|
||||
goog.require('ol.Feature');
|
||||
goog.require('ol.geom.Point');
|
||||
|
||||
Reference in New Issue
Block a user