diff --git a/src/ol/base/attribution.js b/src/ol/base/attribution.js index 7363b82c9c..acf59930e3 100644 --- a/src/ol/base/attribution.js +++ b/src/ol/base/attribution.js @@ -23,14 +23,13 @@ ol.Attribution = function(html, opt_coverageAreas, opt_projection) { * @private * @type {Array.} */ - this.coverageAreas_ = - goog.isDef(opt_coverageAreas) ? opt_coverageAreas : null; + this.coverageAreas_ = opt_coverageAreas || null; /** * @private * @type {ol.Projection} */ - this.projection_ = goog.isDef(opt_projection) ? opt_projection : null; + this.projection_ = opt_projection || null; }; diff --git a/src/ol/base/collection.js b/src/ol/base/collection.js index 2810e3a492..bec2f650c3 100644 --- a/src/ol/base/collection.js +++ b/src/ol/base/collection.js @@ -82,7 +82,7 @@ ol.Collection = function(opt_array) { * @private * @type {Array} */ - this.array_ = goog.isDefAndNotNull(opt_array) ? opt_array : []; + this.array_ = opt_array || []; this.updateLength_(); diff --git a/src/ol/base/color.js b/src/ol/base/color.js index 0792334ce4..43e8e0c17f 100644 --- a/src/ol/base/color.js +++ b/src/ol/base/color.js @@ -43,7 +43,7 @@ ol.Color = function(r, g, b, a) { */ ol.Color.createFromString = function(str, opt_a) { var rgb = goog.color.hexToRgb(goog.color.parse(str).hex); - var a = goog.isDef(opt_a) ? opt_a : 255; + var a = opt_a || 255; return new ol.Color(rgb[0], rgb[1], rgb[2], a); }; diff --git a/src/ol/base/map.js b/src/ol/base/map.js index 3ad7433d5f..b1a44eeb38 100644 --- a/src/ol/base/map.js +++ b/src/ol/base/map.js @@ -189,8 +189,8 @@ ol.Map = function(target, opt_values, opt_viewportSizeMonitor) { * @private * @type {goog.dom.ViewportSizeMonitor} */ - this.viewportSizeMonitor_ = goog.isDef(opt_viewportSizeMonitor) ? - opt_viewportSizeMonitor : new goog.dom.ViewportSizeMonitor(); + this.viewportSizeMonitor_ = + opt_viewportSizeMonitor || new goog.dom.ViewportSizeMonitor(); goog.events.listen(this.viewportSizeMonitor_, goog.events.EventType.RESIZE, this.handleViewportResize, false, this); @@ -580,7 +580,7 @@ ol.Map.prototype.handleBackgroundColorChanged = goog.nullFunction; * @param {string=} opt_type Type. */ ol.Map.prototype.handleBrowserEvent = function(browserEvent, opt_type) { - var type = goog.isDef(opt_type) ? opt_type : browserEvent.type; + var type = opt_type || browserEvent.type; var mapBrowserEvent = new ol.MapBrowserEvent(type, this, browserEvent); var controls = this.getControls(); var controlsArray = /** @type {Array.} */ controls.getArray(); diff --git a/src/ol/base/object.js b/src/ol/base/object.js index 7567df288e..6518c89b83 100644 --- a/src/ol/base/object.js +++ b/src/ol/base/object.js @@ -157,7 +157,7 @@ ol.Object.getListeners = function(obj) { */ ol.Object.prototype.bindTo = function(key, target, opt_targetKey, opt_noNotify) { - var targetKey = goog.isDef(opt_targetKey) ? opt_targetKey : key; + var targetKey = opt_targetKey || key; this.unbind(key); var eventType = ol.Object.getChangedEventType(targetKey); var listeners = ol.Object.getListeners(this); @@ -166,7 +166,7 @@ ol.Object.prototype.bindTo = }, undefined, this); var accessors = ol.Object.getAccessors(this); accessors[key] = {target: target, key: targetKey}; - var noNotify = goog.isDef(opt_noNotify) ? opt_noNotify : false; + var noNotify = opt_noNotify || false; if (!noNotify) { this.notifyInternal_(key); } diff --git a/src/ol/base/store.js b/src/ol/base/store.js index bd7b6469ce..1bc9912a3e 100644 --- a/src/ol/base/store.js +++ b/src/ol/base/store.js @@ -25,13 +25,13 @@ ol.Store = function(projection, opt_extent, opt_attributions) { * @private * @type {ol.Extent} */ - this.extent_ = goog.isDef(opt_extent) ? opt_extent : projection.getExtent(); + this.extent_ = opt_extent || projection.getExtent(); /** * @private * @type {Array.} */ - this.attributions_ = goog.isDef(opt_attributions) ? opt_attributions : null; + this.attributions_ = opt_attributions || null; }; diff --git a/src/ol/tile/bingmaps.js b/src/ol/tile/bingmaps.js index 100603bdcf..0d282f2065 100644 --- a/src/ol/tile/bingmaps.js +++ b/src/ol/tile/bingmaps.js @@ -59,7 +59,7 @@ ol.tilestore.BingMaps = * @private * @type {string} */ - this.culture_ = goog.isDef(opt_culture) ? opt_culture : 'en-us'; + this.culture_ = opt_culture || 'en-us'; /** * @private @@ -71,7 +71,7 @@ ol.tilestore.BingMaps = * @private * @type {?function(ol.tilestore.BingMaps)} */ - this.callback_ = goog.isDef(opt_callback) ? opt_callback : null; + this.callback_ = opt_callback || null; /** * @private diff --git a/src/ol/tile/tilegrid.js b/src/ol/tile/tilegrid.js index c563b19154..4fea740353 100644 --- a/src/ol/tile/tilegrid.js +++ b/src/ol/tile/tilegrid.js @@ -69,8 +69,7 @@ ol.TileGrid = function(resolutions, extent, origin, opt_tileSize) { * @private * @type {ol.Size} */ - this.tileSize_ = goog.isDef(opt_tileSize) ? - opt_tileSize : new ol.Size(256, 256); + this.tileSize_ = opt_tileSize || new ol.Size(256, 256); }; diff --git a/src/ol/tile/tilejson.js b/src/ol/tile/tilejson.js index 9f61859342..1b6a17ea1f 100644 --- a/src/ol/tile/tilejson.js +++ b/src/ol/tile/tilejson.js @@ -71,7 +71,7 @@ ol.tilestore.TileJSON = function(uri, opt_callback, opt_obj) { * @private * @type {?function(ol.tilestore.TileJSON)} */ - this.callback_ = goog.isDef(opt_callback) ? opt_callback : null; + this.callback_ = opt_callback || null; /** * @private diff --git a/src/ol/tile/tilestore.js b/src/ol/tile/tilestore.js index 4eb19346a1..9f9b1ba522 100644 --- a/src/ol/tile/tilestore.js +++ b/src/ol/tile/tilestore.js @@ -40,8 +40,7 @@ ol.TileStore = function(projection, tileGrid, tileUrlFunction, opt_extent, * @private * @type {?string} */ - this.crossOrigin_ = - goog.isDef(opt_crossOrigin) ? opt_crossOrigin : 'anonymous'; + this.crossOrigin_ = opt_crossOrigin || 'anonymous'; /** * @private