Remove use of goog.dispose()

This commit is contained in:
Tim Schaub
2016-03-01 23:35:22 -07:00
parent df4f154a93
commit ae4d8195c0
25 changed files with 65 additions and 86 deletions
+5 -6
View File
@@ -13,12 +13,12 @@ describe('ol.control.Control', function() {
});
afterEach(function() {
goog.dispose(map);
map.dispose();
});
describe('dispose', function() {
it('removes the control element from its parent', function() {
goog.dispose(control);
control.dispose();
expect(control.element.parentNode).to.be(null);
});
});
@@ -32,7 +32,7 @@ describe('ol.control.Control\'s target', function() {
document.body.appendChild(target);
var ctrl = new ol.control.Control({target: 'mycontrol'});
expect(ctrl.target_.id).to.equal('mycontrol');
goog.dispose(ctrl);
ctrl.dispose();
});
it('accepts element for target', function() {
var target = document.createElement('div');
@@ -40,16 +40,15 @@ describe('ol.control.Control\'s target', function() {
document.body.appendChild(target);
var ctrl = new ol.control.Control({target: target});
expect(ctrl.target_.id).to.equal('mycontrol');
goog.dispose(ctrl);
ctrl.dispose();
});
it('ignores non-existing target id', function() {
var ctrl = new ol.control.Control({target: 'doesnotexist'});
expect(ctrl.target_).to.equal(null);
goog.dispose(ctrl);
ctrl.dispose();
});
});
});
goog.require('goog.dispose');
goog.require('ol.Map');
goog.require('ol.control.Control');
@@ -12,7 +12,7 @@ describe('ol.control.OverviewMap', function() {
});
afterEach(function() {
goog.dispose(map);
map.dispose();
document.body.removeChild(target);
map = null;
target = null;
@@ -15,8 +15,8 @@ describe('ol.control.ZoomSlider', function() {
});
afterEach(function() {
goog.dispose(zoomslider);
goog.dispose(map);
zoomslider.dispose();
map.dispose();
document.body.removeChild(target);
zoomslider = null;
map = null;
@@ -68,7 +68,7 @@ describe('ol.control.ZoomSlider', function() {
var horizontal = ol.control.ZoomSlider.direction.HORIZONTAL;
expect(control.direction_).to.be(horizontal);
goog.dispose(control);
control.dispose();
});
it('is vertical for tall containers', function() {
@@ -81,7 +81,7 @@ describe('ol.control.ZoomSlider', function() {
var vertical = ol.control.ZoomSlider.direction.VERTICAL;
expect(control.direction_).to.be(vertical);
goog.dispose(control);
control.dispose();
});
});
@@ -178,7 +178,6 @@ describe('ol.control.ZoomSlider', function() {
});
goog.require('goog.Disposable');
goog.require('goog.dispose');
goog.require('goog.dom.classlist');
goog.require('ol.Map');
goog.require('ol.View');