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

Merge pull request #4176 from tschaub/remove-isdefandnotnull

Browse Source 
Remove use of goog.isDefAndNotNull().
This commit is contained in:
Tim Schaub
2015-10-01 00:05:57 -06:00
parent 74fffd5851 ab87eb8af0
commit 6bdacced92
45 changed files with 116 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/renderer/canvas/canvasvectorlayerrenderer.js
View File

@@ -284,7 +284,7 @@ ol.renderer.canvas.VectorLayer.prototype.prepareFrame =
styles = styleFunction(feature, resolution);
}
}
if (goog.isDefAndNotNull(styles)) {
if (styles) {
var dirty = this.renderFeature(
feature, resolution, pixelRatio, styles, replayGroup);
this.dirty_ = this.dirty_ || dirty;
@@ -328,7 +328,7 @@ ol.renderer.canvas.VectorLayer.prototype.prepareFrame =
*/
ol.renderer.canvas.VectorLayer.prototype.renderFeature =
function(feature, resolution, pixelRatio, styles, replayGroup) {
if (!goog.isDefAndNotNull(styles)) {
if (!styles) {
return false;
}
var i, ii, loading = false;

4
src/ol/renderer/dom/domvectorlayerrenderer.js
View File

@@ -292,7 +292,7 @@ ol.renderer.dom.VectorLayer.prototype.prepareFrame =
styles = styleFunction(feature, resolution);
}
}
if (goog.isDefAndNotNull(styles)) {
if (styles) {
var dirty = this.renderFeature(
feature, resolution, pixelRatio, styles, replayGroup);
this.dirty_ = this.dirty_ || dirty;
@@ -336,7 +336,7 @@ ol.renderer.dom.VectorLayer.prototype.prepareFrame =
*/
ol.renderer.dom.VectorLayer.prototype.renderFeature =
function(feature, resolution, pixelRatio, styles, replayGroup) {
if (!goog.isDefAndNotNull(styles)) {
if (!styles) {
return false;
}
var i, ii, loading = false;

2
src/ol/renderer/layerrenderer.js
View File

@@ -205,7 +205,7 @@ ol.renderer.Layer.prototype.scheduleExpireCache =
*/
ol.renderer.Layer.prototype.updateAttributions =
function(attributionsSet, attributions) {
if (goog.isDefAndNotNull(attributions)) {
if (attributions) {
var attribution, i, ii;
for (i = 0, ii = attributions.length; i < ii; ++i) {
attribution = attributions[i];

4
src/ol/renderer/webgl/webglvectorlayerrenderer.js
View File

@@ -260,7 +260,7 @@ ol.renderer.webgl.VectorLayer.prototype.prepareFrame =
styles = styleFunction(feature, resolution);
}
}
if (goog.isDefAndNotNull(styles)) {
if (styles) {
var dirty = this.renderFeature(
feature, resolution, pixelRatio, styles, replayGroup);
this.dirty_ = this.dirty_ || dirty;
@@ -304,7 +304,7 @@ ol.renderer.webgl.VectorLayer.prototype.prepareFrame =
*/
ol.renderer.webgl.VectorLayer.prototype.renderFeature =
function(feature, resolution, pixelRatio, styles, replayGroup) {
if (!goog.isDefAndNotNull(styles)) {
if (!styles) {
return false;
}
var i, ii, loading = false;