From d8357ae9329d7f659754d4b9e2cf43544151b824 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 22 Apr 2013 17:14:31 +0200 Subject: [PATCH 1/7] Fix use of dispose in ol.parser.KML --- src/ol/parser/kml.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ol/parser/kml.js b/src/ol/parser/kml.js index 93566c42f5..c541eca743 100644 --- a/src/ol/parser/kml.js +++ b/src/ol/parser/kml.js @@ -3,6 +3,7 @@ goog.require('goog.array'); goog.require('goog.async.Deferred'); goog.require('goog.async.DeferredList'); goog.require('goog.date'); +goog.require('goog.dispose'); goog.require('goog.dom.xml'); goog.require('goog.events'); goog.require('goog.net.EventType'); @@ -875,7 +876,7 @@ ol.parser.KML.prototype.parseLinks = function(deferreds, obj, done) { goog.events.listen(xhr, goog.net.EventType.COMPLETE, function(e) { if (e.target.isSuccess()) { var data = e.target.getResponseXml(); - e.target.dispose(); + goog.dispose(e.target); if (data && data.nodeType == 9) { data = data.documentElement; } From c2e162352903968962067fdd59ee84f8eeea175b Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 22 Apr 2013 17:14:50 +0200 Subject: [PATCH 2/7] Fix use of dispose in ol.control tests --- test/spec/ol/control/control.test.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/spec/ol/control/control.test.js b/test/spec/ol/control/control.test.js index 1f9e1de825..4b4f25bd00 100644 --- a/test/spec/ol/control/control.test.js +++ b/test/spec/ol/control/control.test.js @@ -13,17 +13,18 @@ describe('ol.control.Control', function() { }); afterEach(function() { - map.dispose(); + goog.dispose(map); }); describe('dispose', function() { it('removes the control element from its parent', function() { - control.dispose(); + goog.dispose(control); expect(goog.dom.getParentElement(control.element)).to.be(null); }); }); }); +goog.require('goog.dispose'); goog.require('goog.dom'); goog.require('goog.dom.TagName'); goog.require('ol.Map'); From 744f72355b43cc6761434d3b89235d96adaf286f Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 22 Apr 2013 17:15:07 +0200 Subject: [PATCH 3/7] Fix use of dispose in ol.control.ZoomSlider tests --- test/spec/ol/control/zoomslidercontrol.test.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/spec/ol/control/zoomslidercontrol.test.js b/test/spec/ol/control/zoomslidercontrol.test.js index c1cb4134d6..893d735482 100644 --- a/test/spec/ol/control/zoomslidercontrol.test.js +++ b/test/spec/ol/control/zoomslidercontrol.test.js @@ -15,8 +15,8 @@ describe('ol.control.ZoomSlider', function() { }); afterEach(function() { - zoomslider.dispose(); - map.dispose(); + goog.dispose(zoomslider); + goog.dispose(map); document.body.removeChild(target); zoomslider = null; map = null; @@ -72,7 +72,7 @@ describe('ol.control.ZoomSlider', function() { var horizontal = ol.control.ZoomSlider.direction.HORIZONTAL; expect(control.direction_).to.be(horizontal); - control.dispose(); + goog.dispose(control); }); it('is vertical for tall containers', function() { @@ -85,12 +85,13 @@ describe('ol.control.ZoomSlider', function() { var vertical = ol.control.ZoomSlider.direction.VERTICAL; expect(control.direction_).to.be(vertical); - control.dispose(); + goog.dispose(control); }); }); }); +goog.require('goog.dispose'); goog.require('goog.dom'); goog.require('goog.dom.classes'); goog.require('goog.fx.Dragger'); From 3c541045bb4e2a0b834ef00843eac3436fdcbb91 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 22 Apr 2013 17:15:23 +0200 Subject: [PATCH 4/7] Fix use of dispose in ol.layer.Layer tests --- test/spec/ol/layer/layer.test.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/test/spec/ol/layer/layer.test.js b/test/spec/ol/layer/layer.test.js index 9778950b4c..2476c8e3cb 100644 --- a/test/spec/ol/layer/layer.test.js +++ b/test/spec/ol/layer/layer.test.js @@ -15,7 +15,7 @@ describe('ol.layer.Layer', function() { }); afterEach(function() { - layer.dispose(); + goog.dispose(layer); }); it('creates an instance', function() { @@ -70,7 +70,7 @@ describe('ol.layer.Layer', function() { expect(layer.getSaturation()).to.be(5); expect(layer.getVisible()).to.be(false); - layer.dispose(); + goog.dispose(layer); }); }); @@ -88,7 +88,7 @@ describe('ol.layer.Layer', function() { }); afterEach(function() { - layer.dispose(); + goog.dispose(layer); }); it('accepts a positive number', function() { @@ -126,7 +126,7 @@ describe('ol.layer.Layer', function() { }); afterEach(function() { - layer.dispose(); + goog.dispose(layer); }); it('accepts a small positive number', function() { @@ -160,7 +160,7 @@ describe('ol.layer.Layer', function() { }); afterEach(function() { - layer.dispose(); + goog.dispose(layer); }); it('accepts a small positive number', function() { @@ -199,7 +199,7 @@ describe('ol.layer.Layer', function() { }); afterEach(function() { - layer.dispose(); + goog.dispose(layer); }); it('accepts a positive number', function() { @@ -233,7 +233,7 @@ describe('ol.layer.Layer', function() { }); afterEach(function() { - layer.dispose(); + goog.dispose(layer); }); it('accepts a small positive number', function() { @@ -269,13 +269,14 @@ describe('ol.layer.Layer', function() { layer.setVisible(true); expect(layer.getVisible()).to.be(true); - layer.dispose(); + goog.dispose(layer); }); }); }); +goog.require('goog.dispose'); goog.require('ol.layer.Layer'); goog.require('ol.projection'); goog.require('ol.source.Source'); From 71e06761f02c05faba6c7f03fb59077679b2e19d Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 22 Apr 2013 17:15:40 +0200 Subject: [PATCH 5/7] Fix use of dispose in ol.layer.Vector tests --- test/spec/ol/layer/vectorlayer.test.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/spec/ol/layer/vectorlayer.test.js b/test/spec/ol/layer/vectorlayer.test.js index 598213b2ed..943ffbb059 100644 --- a/test/spec/ol/layer/vectorlayer.test.js +++ b/test/spec/ol/layer/vectorlayer.test.js @@ -170,12 +170,13 @@ describe('ol.layer.Vector', function() { }); - layer.dispose(); + goog.dispose(layer); }); }); +goog.require('goog.dispose'); goog.require('ol.Expression'); goog.require('ol.Feature'); goog.require('ol.filter.Extent'); From 6c369ae90710f4710b922b14345bb09ff488835b Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 22 Apr 2013 17:15:56 +0200 Subject: [PATCH 6/7] Fix use of dispose in ol.Map tests --- test/spec/ol/map.test.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/spec/ol/map.test.js b/test/spec/ol/map.test.js index 7f2e5f5530..2775487034 100644 --- a/test/spec/ol/map.test.js +++ b/test/spec/ol/map.test.js @@ -61,7 +61,7 @@ describe('ol.Map', function() { }); it('removes the viewport from its parent', function() { - map.dispose(); + goog.dispose(map); expect(goog.dom.getParentElement(map.getViewport())).to.be(null); }); }); @@ -223,6 +223,7 @@ describe('ol.Map', function() { }); goog.require('goog.async.AnimationDelay'); +goog.require('goog.dispose'); goog.require('goog.dom'); goog.require('ol.Collection'); goog.require('ol.Map'); From e686eff88691f25b3450e2d92b4713dd7b8d1069 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 22 Apr 2013 17:16:11 +0200 Subject: [PATCH 7/7] Fix use of dispose in ol.renderer.webgl.ImageLayer tests --- test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js b/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js index 21bbafab9f..71894d3c4d 100644 --- a/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js +++ b/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js @@ -37,7 +37,7 @@ describe('ol.renderer.webgl.ImageLayer', function() { }); afterEach(function() { - map.dispose(); + goog.dispose(map); }); it('produces a correct matrix', function() { @@ -77,6 +77,7 @@ describe('ol.renderer.webgl.ImageLayer', function() { }); }); +goog.require('goog.dispose'); goog.require('goog.vec.Mat4'); goog.require('goog.vec.Vec4'); goog.require('ol.Map');