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

Merge pull request #4477 from fredj/use_ol.nullFunction

Browse Source 
Replace goog.nullFunction with ol.nullFunction
This commit is contained in:
Frédéric Junod
2015-11-23 12:19:19 +01:00
parent a2011b035d cacf2629fd
commit 0ecf981673
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/spec/ol/render/vector.test.js
View File

@@ -63,7 +63,7 @@ describe('ol.renderer.vector', function() {
style.getZIndex(), ol.render.ReplayType.IMAGE);
var setImageStyleSpy = sinon.spy(imageReplay, 'setImageStyle');
var drawPointGeometrySpy = sinon.stub(imageReplay,
'drawPointGeometry', goog.nullFunction);
'drawPointGeometry', ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
expect(setImageStyleSpy.called).to.be(false);
@@ -77,7 +77,7 @@ describe('ol.renderer.vector', function() {
style.getZIndex(), ol.render.ReplayType.IMAGE);
var setImageStyleSpy = sinon.spy(imageReplay, 'setImageStyle');
var drawMultiPointGeometrySpy = sinon.stub(imageReplay,
'drawMultiPointGeometry', goog.nullFunction);
'drawMultiPointGeometry', ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
expect(setImageStyleSpy.called).to.be(false);
@@ -92,7 +92,7 @@ describe('ol.renderer.vector', function() {
var setFillStrokeStyleSpy = sinon.spy(lineStringReplay,
'setFillStrokeStyle');
var drawLineStringGeometrySpy = sinon.stub(lineStringReplay,
'drawLineStringGeometry', goog.nullFunction);
'drawLineStringGeometry', ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
expect(setFillStrokeStyleSpy.called).to.be(true);
@@ -108,7 +108,7 @@ describe('ol.renderer.vector', function() {
var setFillStrokeStyleSpy = sinon.spy(lineStringReplay,
'setFillStrokeStyle');
var drawMultiLineStringGeometrySpy = sinon.stub(lineStringReplay,
'drawMultiLineStringGeometry', goog.nullFunction);
'drawMultiLineStringGeometry', ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
expect(setFillStrokeStyleSpy.called).to.be(true);
@@ -125,7 +125,7 @@ describe('ol.renderer.vector', function() {
var setFillStrokeStyleSpy = sinon.spy(polygonReplay,
'setFillStrokeStyle');
var drawPolygonGeometrySpy = sinon.stub(polygonReplay,
'drawPolygonGeometry', goog.nullFunction);
'drawPolygonGeometry', ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
expect(setFillStrokeStyleSpy.called).to.be(true);
@@ -142,7 +142,7 @@ describe('ol.renderer.vector', function() {
var setFillStrokeStyleSpy = sinon.spy(polygonReplay,
'setFillStrokeStyle');
var drawMultiPolygonGeometrySpy = sinon.stub(polygonReplay,
'drawMultiPolygonGeometry', goog.nullFunction);
'drawMultiPolygonGeometry', ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
expect(setFillStrokeStyleSpy.called).to.be(true);

4
test/spec/ol/style/iconstyle.test.js
View File

@@ -181,14 +181,14 @@ describe('ol.style.IconImageCache', function() {
src = '0';
iconImage = new ol.style.IconImage_(src, null);
goog.events.listen(iconImage, goog.events.EventType.CHANGE,
goog.nullFunction, false);
ol.nullFunction, false);
cache.set(src, null, iconImage);
expect(cache.cacheSize_).to.eql(4);
src = '4';
iconImage = new ol.style.IconImage_(src, null);
goog.events.listen(iconImage, goog.events.EventType.CHANGE,
goog.nullFunction, false);
ol.nullFunction, false);
cache.set(src, null, iconImage);
expect(cache.cacheSize_).to.eql(5);