Rename _ol_Observable_ to Observable
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import EventTarget from '../../../src/ol/events/EventTarget.js';
|
||||
import _ol_Observable_ from '../../../src/ol/Observable.js';
|
||||
import Observable from '../../../src/ol/Observable.js';
|
||||
|
||||
|
||||
describe('ol.Observable', function() {
|
||||
@@ -7,8 +7,8 @@ describe('ol.Observable', function() {
|
||||
describe('constructor', function() {
|
||||
|
||||
it('creates a new observable', function() {
|
||||
var observable = new _ol_Observable_();
|
||||
expect(observable).to.be.a(_ol_Observable_);
|
||||
var observable = new Observable();
|
||||
expect(observable).to.be.a(Observable);
|
||||
expect(observable).to.be.a(EventTarget);
|
||||
});
|
||||
|
||||
@@ -17,7 +17,7 @@ describe('ol.Observable', function() {
|
||||
describe('#on()', function() {
|
||||
var observable, listener;
|
||||
beforeEach(function() {
|
||||
observable = new _ol_Observable_();
|
||||
observable = new Observable();
|
||||
listener = sinon.spy();
|
||||
});
|
||||
|
||||
@@ -52,7 +52,7 @@ describe('ol.Observable', function() {
|
||||
describe('#once()', function() {
|
||||
var observable, listener;
|
||||
beforeEach(function() {
|
||||
observable = new _ol_Observable_();
|
||||
observable = new Observable();
|
||||
listener = sinon.spy();
|
||||
});
|
||||
|
||||
@@ -108,7 +108,7 @@ describe('ol.Observable', function() {
|
||||
describe('#un()', function() {
|
||||
var observable, listener;
|
||||
beforeEach(function() {
|
||||
observable = new _ol_Observable_();
|
||||
observable = new Observable();
|
||||
listener = sinon.spy();
|
||||
});
|
||||
|
||||
@@ -128,7 +128,7 @@ describe('ol.Observable', function() {
|
||||
describe('ol.Observable.unByKey()', function() {
|
||||
var observable, listener;
|
||||
beforeEach(function() {
|
||||
observable = new _ol_Observable_();
|
||||
observable = new Observable();
|
||||
listener = sinon.spy();
|
||||
});
|
||||
|
||||
@@ -138,7 +138,7 @@ describe('ol.Observable', function() {
|
||||
observable.dispatchEvent('foo');
|
||||
expect(listener.calledOnce).to.be(true);
|
||||
|
||||
_ol_Observable_.unByKey(key);
|
||||
Observable.unByKey(key);
|
||||
observable.dispatchEvent('foo');
|
||||
expect(listener.callCount).to.be(1);
|
||||
});
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import _ol_net_ from '../../../../src/ol/net.js';
|
||||
import _ol_source_BingMaps_ from '../../../../src/ol/source/BingMaps.js';
|
||||
import _ol_tilecoord_ from '../../../../src/ol/tilecoord.js';
|
||||
import _ol_Observable_ from '../../../../src/ol/Observable.js';
|
||||
import Observable from '../../../../src/ol/Observable.js';
|
||||
|
||||
|
||||
describe('ol.source.BingMaps', function() {
|
||||
@@ -28,7 +28,7 @@ describe('ol.source.BingMaps', function() {
|
||||
_ol_net_.jsonp = olNetJsonp;
|
||||
var key = source.on('change', function() {
|
||||
if (source.getState() === 'ready') {
|
||||
_ol_Observable_.unByKey(key);
|
||||
Observable.unByKey(key);
|
||||
tileGrid = source.getTileGrid();
|
||||
done();
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import Source from '../../../../src/ol/source/Source.js';
|
||||
import _ol_source_TileJSON_ from '../../../../src/ol/source/TileJSON.js';
|
||||
import _ol_Observable_ from '../../../../src/ol/Observable.js';
|
||||
import Observable from '../../../../src/ol/Observable.js';
|
||||
|
||||
|
||||
describe('ol.source.TileJSON', function() {
|
||||
@@ -115,7 +115,7 @@ describe('ol.source.TileJSON', function() {
|
||||
});
|
||||
var key = source.on('change', function() {
|
||||
if (source.getState() === 'ready') {
|
||||
_ol_Observable_.unByKey(key);
|
||||
Observable.unByKey(key);
|
||||
tileGrid = source.getTileGrid();
|
||||
done();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user