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

Inline simple goog.isDef() calls

Browse Source
This commit is contained in:
Tim Schaub
2015-09-27 10:34:44 -06:00
parent a86c270f6a
commit e3951fa3c6
45 changed files with 172 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ol/style/atlasmanager.js
View File

@@ -191,7 +191,7 @@ ol.style.AtlasManager.prototype.add =
// even if no hit-detection entry is requested, we insert a fake entry into
// the hit-detection atlas, to make sure that the offset is the same for
// the original image and the hit-detection image.
var renderHitCallback = goog.isDef(opt_renderHitCallback) ?
var renderHitCallback = opt_renderHitCallback !== undefined ?
opt_renderHitCallback : goog.functions.NULL;
/** @type {?ol.style.AtlasInfo} */

8
src/ol/style/iconstyle.js
View File

@@ -105,10 +105,10 @@ ol.style.Icon = function(opt_options) {
*/
var src = options.src;
goog.asserts.assert(!(goog.isDef(src) && !goog.isNull(image)),
goog.asserts.assert(!(src !== undefined && !goog.isNull(image)),
'image and src can not provided at the same time');
goog.asserts.assert(
src === undefined || (goog.isDef(src) && goog.isNull(imgSize)),
src === undefined || (src !== undefined && goog.isNull(imgSize)),
'imgSize should not be set when src is provided');
goog.asserts.assert(
goog.isNull(image) || (!goog.isNull(image) && !goog.isNull(imgSize)),
@@ -117,7 +117,7 @@ ol.style.Icon = function(opt_options) {
if ((src === undefined || src.length === 0) && !goog.isNull(image)) {
src = image.src;
}
goog.asserts.assert(goog.isDef(src) && src.length > 0,
goog.asserts.assert(src !== undefined && src.length > 0,
'must provide a defined and non-empty src or image');
/**
@@ -620,7 +620,7 @@ goog.addSingletonGetter(ol.style.IconImageCache);
* @return {string} Cache key.
*/
ol.style.IconImageCache.getKey = function(src, crossOrigin) {
goog.asserts.assert(goog.isDef(crossOrigin),
goog.asserts.assert(crossOrigin !== undefined,
'argument crossOrigin must be defined');
return crossOrigin + ':' + src;
};