From 17ed43d2302b0964a9c55712a74e453b28129939 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 8 Apr 2014 11:40:02 +0200 Subject: [PATCH] Fix coding style Use `goog.isDef(x) ? x : {}` instead of `x || {}` --- src/ol/control/scalelinecontrol.js | 2 +- src/ol/source/wmtssource.js | 2 +- src/ol/view2d.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ol/control/scalelinecontrol.js b/src/ol/control/scalelinecontrol.js index 91f5dfadc5..b09110fd5c 100644 --- a/src/ol/control/scalelinecontrol.js +++ b/src/ol/control/scalelinecontrol.js @@ -55,7 +55,7 @@ ol.control.ScaleLineUnits = { */ ol.control.ScaleLine = function(opt_options) { - var options = opt_options || {}; + var options = goog.isDef(opt_options) ? opt_options : {}; var className = goog.isDef(options.className) ? options.className : 'ol-scale-line'; diff --git a/src/ol/source/wmtssource.js b/src/ol/source/wmtssource.js index 9bd0ce9c5c..445f65de80 100644 --- a/src/ol/source/wmtssource.js +++ b/src/ol/source/wmtssource.js @@ -42,7 +42,7 @@ ol.source.WMTS = function(options) { * @private * @type {Object} */ - this.dimensions_ = options.dimensions || {}; + this.dimensions_ = goog.isDef(options.dimensions) ? options.dimensions : {}; /** * @private diff --git a/src/ol/view2d.js b/src/ol/view2d.js index 9cf2cea83a..b87e6dfe58 100644 --- a/src/ol/view2d.js +++ b/src/ol/view2d.js @@ -94,7 +94,7 @@ ol.View2DProperty = { */ ol.View2D = function(opt_options) { goog.base(this); - var options = opt_options || {}; + var options = goog.isDef(opt_options) ? opt_options : {}; /** * @type {Object.}