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

Rename _ol_Observable_ to Observable

Browse Source
This commit is contained in:
Tim Schaub
2018-01-08 10:01:38 -07:00
parent 1c1f008238
commit 35db8721b2
8 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/feature-animation.js
View File

@@ -1,6 +1,6 @@
import Feature from '../src/ol/Feature.js';
import Map from '../src/ol/Map.js';
import _ol_Observable_ from '../src/ol/Observable.js';
import Observable from '../src/ol/Observable.js';
import View from '../src/ol/View.js';
import {defaults as defaultControls} from '../src/ol/control.js';
import {easeOut} from '../src/ol/easing.js';
@@ -80,7 +80,7 @@ function flash(feature) {
vectorContext.setStyle(style);
vectorContext.drawGeometry(flashGeom);
if (elapsed > duration) {
_ol_Observable_.unByKey(listenerKey);
Observable.unByKey(listenerKey);
return;
}
// tell OpenLayers to continue postcompose animation

4
examples/measure.js
View File

@@ -1,5 +1,5 @@
import Map from '../src/ol/Map.js';
import _ol_Observable_ from '../src/ol/Observable.js';
import Observable from '../src/ol/Observable.js';
import _ol_Overlay_ from '../src/ol/Overlay.js';
import {getArea, getLength} from '../src/ol/sphere.js';
import View from '../src/ol/View.js';
@@ -238,7 +238,7 @@ function addInteraction() {
// unset tooltip so that a new one can be created
measureTooltipElement = null;
createMeasureTooltip();
_ol_Observable_.unByKey(listener);
Observable.unByKey(listener);
}, this);
}

6
src/ol/Object.js
View File

@@ -3,7 +3,7 @@
*/
import {getUid, inherits} from './index.js';
import ObjectEventType from './ObjectEventType.js';
import _ol_Observable_ from './Observable.js';
import Observable from './Observable.js';
import Event from './events/Event.js';
import _ol_obj_ from './obj.js';
@@ -53,7 +53,7 @@ import _ol_obj_ from './obj.js';
* @api
*/
var _ol_Object_ = function(opt_values) {
_ol_Observable_.call(this);
Observable.call(this);
// Call ol.getUid to ensure that the order of objects' ids is the same as
// the order in which they were created. This also helps to ensure that
@@ -72,7 +72,7 @@ var _ol_Object_ = function(opt_values) {
}
};
inherits(_ol_Object_, _ol_Observable_);
inherits(_ol_Object_, Observable);
/**

20
src/ol/Observable.js
View File

@@ -20,7 +20,7 @@ import EventType from './events/EventType.js';
* @struct
* @api
*/
var _ol_Observable_ = function() {
var Observable = function() {
EventTarget.call(this);
@@ -32,7 +32,7 @@ var _ol_Observable_ = function() {
};
inherits(_ol_Observable_, EventTarget);
inherits(Observable, EventTarget);
/**
@@ -41,7 +41,7 @@ inherits(_ol_Observable_, EventTarget);
* or `once()` (or an array of keys).
* @api
*/
_ol_Observable_.unByKey = function(key) {
Observable.unByKey = function(key) {
if (Array.isArray(key)) {
for (var i = 0, ii = key.length; i < ii; ++i) {
_ol_events_.unlistenByKey(key[i]);
@@ -56,7 +56,7 @@ _ol_Observable_.unByKey = function(key) {
* Increases the revision counter and dispatches a 'change' event.
* @api
*/
_ol_Observable_.prototype.changed = function() {
Observable.prototype.changed = function() {
++this.revision_;
this.dispatchEvent(EventType.CHANGE);
};
@@ -73,7 +73,7 @@ _ol_Observable_.prototype.changed = function() {
* @function
* @api
*/
_ol_Observable_.prototype.dispatchEvent;
Observable.prototype.dispatchEvent;
/**
@@ -82,7 +82,7 @@ _ol_Observable_.prototype.dispatchEvent;
* @return {number} Revision.
* @api
*/
_ol_Observable_.prototype.getRevision = function() {
Observable.prototype.getRevision = function() {
return this.revision_;
};
@@ -96,7 +96,7 @@ _ol_Observable_.prototype.getRevision = function() {
* will be an array of keys.
* @api
*/
_ol_Observable_.prototype.on = function(type, listener) {
Observable.prototype.on = function(type, listener) {
if (Array.isArray(type)) {
var len = type.length;
var keys = new Array(len);
@@ -120,7 +120,7 @@ _ol_Observable_.prototype.on = function(type, listener) {
* will be an array of keys.
* @api
*/
_ol_Observable_.prototype.once = function(type, listener) {
Observable.prototype.once = function(type, listener) {
if (Array.isArray(type)) {
var len = type.length;
var keys = new Array(len);
@@ -141,7 +141,7 @@ _ol_Observable_.prototype.once = function(type, listener) {
* @param {function(?): ?} listener The listener function.
* @api
*/
_ol_Observable_.prototype.un = function(type, listener) {
Observable.prototype.un = function(type, listener) {
if (Array.isArray(type)) {
for (var i = 0, ii = type.length; i < ii; ++i) {
_ol_events_.unlisten(this, type[i], listener);
@@ -151,4 +151,4 @@ _ol_Observable_.prototype.un = function(type, listener) {
_ol_events_.unlisten(this, /** @type {string} */ (type), listener);
}
};
export default _ol_Observable_;
export default Observable;

6
src/ol/renderer/Layer.js
View File

@@ -3,7 +3,7 @@
*/
import {getUid, inherits, nullFunction} from '../index.js';
import ImageState from '../ImageState.js';
import _ol_Observable_ from '../Observable.js';
import Observable from '../Observable.js';
import TileState from '../TileState.js';
import _ol_events_ from '../events.js';
import EventType from '../events/EventType.js';
@@ -18,7 +18,7 @@ import SourceState from '../source/State.js';
*/
var _ol_renderer_Layer_ = function(layer) {
_ol_Observable_.call(this);
Observable.call(this);
/**
* @private
@@ -29,7 +29,7 @@ var _ol_renderer_Layer_ = function(layer) {
};
inherits(_ol_renderer_Layer_, _ol_Observable_);
inherits(_ol_renderer_Layer_, Observable);
/**

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

@@ -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);
});

4
test/spec/ol/source/bingmaps.test.js
View File

@@ -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();
}

4
test/spec/ol/source/tilejson.test.js
View File

@@ -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();
}