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

Rename _ol_Disposable_ to Disposable

Browse Source
This commit is contained in:
Frederic Junod
2017-12-22 09:02:23 +01:00
parent fc00aecd2e
commit 085fddcb36
9 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ol/Disposable.js
View File

@@ -7,19 +7,19 @@ import {nullFunction} from './index.js';
* Objects that need to clean up after themselves.
* @constructor
*/
var _ol_Disposable_ = function() {};
var Disposable = function() {};
/**
* The object has already been disposed.
* @type {boolean}
* @private
*/
_ol_Disposable_.prototype.disposed_ = false;
Disposable.prototype.disposed_ = false;
/**
* Clean up.
*/
_ol_Disposable_.prototype.dispose = function() {
Disposable.prototype.dispose = function() {
if (!this.disposed_) {
this.disposed_ = true;
this.disposeInternal();
@@ -30,5 +30,5 @@ _ol_Disposable_.prototype.dispose = function() {
* Extension point for disposable objects.
* @protected
*/
_ol_Disposable_.prototype.disposeInternal = nullFunction;
export default _ol_Disposable_;
Disposable.prototype.disposeInternal = nullFunction;
export default Disposable;

6
src/ol/events/EventTarget.js
View File

@@ -2,7 +2,7 @@
* @module ol/events/EventTarget
*/
import {inherits, nullFunction} from '../index.js';
import _ol_Disposable_ from '../Disposable.js';
import Disposable from '../Disposable.js';
import _ol_events_ from '../events.js';
import Event from '../events/Event.js';
@@ -26,7 +26,7 @@ import Event from '../events/Event.js';
*/
var EventTarget = function() {
_ol_Disposable_.call(this);
Disposable.call(this);
/**
* @private
@@ -48,7 +48,7 @@ var EventTarget = function() {
};
inherits(EventTarget, _ol_Disposable_);
inherits(EventTarget, Disposable);
/**

4
src/ol/render/Box.js
View File

@@ -4,7 +4,7 @@
// FIXME add rotation
import {inherits} from '../index.js';
import _ol_Disposable_ from '../Disposable.js';
import Disposable from '../Disposable.js';
import Polygon from '../geom/Polygon.js';
/**
@@ -48,7 +48,7 @@ var _ol_render_Box_ = function(className) {
};
inherits(_ol_render_Box_, _ol_Disposable_);
inherits(_ol_render_Box_, Disposable);
/**

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

@@ -2,7 +2,7 @@
* @module ol/renderer/Map
*/
import {getUid, inherits, nullFunction} from '../index.js';
import _ol_Disposable_ from '../Disposable.js';
import Disposable from '../Disposable.js';
import _ol_events_ from '../events.js';
import EventType from '../events/EventType.js';
import {getWidth} from '../extent.js';
@@ -22,7 +22,7 @@ import _ol_transform_ from '../transform.js';
*/
var _ol_renderer_Map_ = function(container, map) {
_ol_Disposable_.call(this);
Disposable.call(this);
/**
@@ -45,7 +45,7 @@ var _ol_renderer_Map_ = function(container, map) {
};
inherits(_ol_renderer_Map_, _ol_Disposable_);
inherits(_ol_renderer_Map_, Disposable);
/**

4
src/ol/webgl/Context.js
View File

@@ -2,7 +2,7 @@
* @module ol/webgl/Context
*/
import {WEBGL_EXTENSIONS, getUid, inherits} from '../index.js';
import _ol_Disposable_ from '../Disposable.js';
import Disposable from '../Disposable.js';
import {includes} from '../array.js';
import _ol_events_ from '../events.js';
import _ol_obj_ from '../obj.js';
@@ -91,7 +91,7 @@ var _ol_webgl_Context_ = function(canvas, gl) {
};
inherits(_ol_webgl_Context_, _ol_Disposable_);
inherits(_ol_webgl_Context_, Disposable);
/**

12
test/spec/ol/disposable.test.js
View File

@@ -1,4 +1,4 @@
import _ol_Disposable_ from '../../../src/ol/Disposable.js';
import Disposable from '../../../src/ol/Disposable.js';
describe('ol.Disposable', function() {
@@ -6,8 +6,8 @@ describe('ol.Disposable', function() {
describe('constructor', function() {
it('creates an instance', function() {
var disposable = new _ol_Disposable_();
expect(disposable).to.be.a(_ol_Disposable_);
var disposable = new Disposable();
expect(disposable).to.be.a(Disposable);
});
});
@@ -15,12 +15,12 @@ describe('ol.Disposable', function() {
describe('#disposed_', function() {
it('is initially false', function() {
var disposable = new _ol_Disposable_();
var disposable = new Disposable();
expect(disposable.disposed_).to.be(false);
});
it('is true after a call to dispose', function() {
var disposable = new _ol_Disposable_();
var disposable = new Disposable();
disposable.dispose();
expect(disposable.disposed_).to.be(true);
});
@@ -30,7 +30,7 @@ describe('ol.Disposable', function() {
describe('#dispose()', function() {
it('calls disposeInternal only once', function() {
var disposable = new _ol_Disposable_();
var disposable = new Disposable();
sinon.spy(disposable, 'disposeInternal');
expect(disposable.disposeInternal.called).to.be(false);
disposable.dispose();

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

@@ -1,4 +1,4 @@
import _ol_Disposable_ from '../../../../src/ol/Disposable.js';
import Disposable from '../../../../src/ol/Disposable.js';
import _ol_events_ from '../../../../src/ol/events.js';
import Event from '../../../../src/ol/events/Event.js';
import EventTarget from '../../../../src/ol/events/EventTarget.js';
@@ -23,7 +23,7 @@ describe('ol.events.EventTarget', function() {
describe('constructor', function() {
it('creates an instance', function() {
expect(eventTarget).to.be.a(EventTarget);
expect(eventTarget).to.be.a(_ol_Disposable_);
expect(eventTarget).to.be.a(Disposable);
});
it('creates an empty listeners_ object', function() {
expect(Object.keys(eventTarget.listeners_)).to.have.length(0);

4
test/spec/ol/render/box.test.js
View File

@@ -1,4 +1,4 @@
import _ol_Disposable_ from '../../../../src/ol/Disposable.js';
import Disposable from '../../../../src/ol/Disposable.js';
import Map from '../../../../src/ol/Map.js';
import _ol_View_ from '../../../../src/ol/View.js';
import Polygon from '../../../../src/ol/geom/Polygon.js';
@@ -35,7 +35,7 @@ describe('ol.render.Box', function() {
it('creates an instance', function() {
var obj = new _ol_render_Box_('test-box');
expect(obj).to.be.a(_ol_render_Box_);
expect(obj).to.be.a(_ol_Disposable_);
expect(obj).to.be.a(Disposable);
obj.dispose();
});
it('creates an absolutely positioned DIV with a className', function() {

4
test/spec/ol/renderer/map.test.js
View File

@@ -1,4 +1,4 @@
import _ol_Disposable_ from '../../../../src/ol/Disposable.js';
import Disposable from '../../../../src/ol/Disposable.js';
import Map from '../../../../src/ol/Map.js';
import _ol_renderer_Map_ from '../../../../src/ol/renderer/Map.js';
@@ -11,7 +11,7 @@ describe('ol.renderer.Map', function() {
var map = new Map({});
var renderer = new _ol_renderer_Map_(null, map);
expect(renderer).to.be.a(_ol_renderer_Map_);
expect(renderer).to.be.a(_ol_Disposable_);
expect(renderer).to.be.a(Disposable);
renderer.dispose();
map.dispose();
});