From 9703be932d78bf07455557ad42fb97d9a51f25bc Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 10 Feb 2016 14:26:03 +0100 Subject: [PATCH 1/9] Fix checks for undefined in attributioncontrol --- src/ol/control/attributioncontrol.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ol/control/attributioncontrol.js b/src/ol/control/attributioncontrol.js index 7795f29cfa..4ec528b2b3 100644 --- a/src/ol/control/attributioncontrol.js +++ b/src/ol/control/attributioncontrol.js @@ -64,11 +64,11 @@ ol.control.Attribution = function(opt_options) { this.collapsed_ = false; } - var className = options.className ? options.className : 'ol-attribution'; + var className = options.className !== undefined ? options.className : 'ol-attribution'; - var tipLabel = options.tipLabel ? options.tipLabel : 'Attributions'; + var tipLabel = options.tipLabel !== undefined ? options.tipLabel : 'Attributions'; - var collapseLabel = options.collapseLabel ? options.collapseLabel : '\u00BB'; + var collapseLabel = options.collapseLabel !== undefined ? options.collapseLabel : '\u00BB'; /** * @private @@ -78,7 +78,7 @@ ol.control.Attribution = function(opt_options) { goog.dom.createDom('SPAN', {}, collapseLabel) : collapseLabel; - var label = options.label ? options.label : 'i'; + var label = options.label !== undefined ? options.label : 'i'; /** * @private From a513754d25dcc7e546bbe279dc2607f861ed2350 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 10 Feb 2016 14:26:17 +0100 Subject: [PATCH 2/9] Fix checks for undefined in fullscreencontrol --- src/ol/control/fullscreencontrol.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ol/control/fullscreencontrol.js b/src/ol/control/fullscreencontrol.js index 0086d93339..8126320769 100644 --- a/src/ol/control/fullscreencontrol.js +++ b/src/ol/control/fullscreencontrol.js @@ -37,9 +37,10 @@ ol.control.FullScreen = function(opt_options) { * @private * @type {string} */ - this.cssClassName_ = options.className ? options.className : 'ol-full-screen'; + this.cssClassName_ = options.className !== undefined ? options.className : + 'ol-full-screen'; - var label = options.label ? options.label : '\u2922'; + var label = options.label !== undefined ? options.label : '\u2922'; /** * @private @@ -48,7 +49,7 @@ ol.control.FullScreen = function(opt_options) { this.labelNode_ = typeof label === 'string' ? document.createTextNode(label) : label; - var labelActive = options.labelActive ? options.labelActive : '\u00d7'; + var labelActive = options.labelActive !== undefined ? options.labelActive : '\u00d7'; /** * @private From 6779ab5e296055e9969701a5d83b33c7d0bf2fda Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 10 Feb 2016 14:26:31 +0100 Subject: [PATCH 3/9] Fix checks for undefined in mousepositioncontrol --- src/ol/control/mousepositioncontrol.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ol/control/mousepositioncontrol.js b/src/ol/control/mousepositioncontrol.js index 7a558a042a..bb8e2a01d8 100644 --- a/src/ol/control/mousepositioncontrol.js +++ b/src/ol/control/mousepositioncontrol.js @@ -40,7 +40,8 @@ ol.control.MousePosition = function(opt_options) { var options = opt_options ? opt_options : {}; - var className = options.className ? options.className : 'ol-mouse-position'; + var className = options.className !== undefined ? options.className : + 'ol-mouse-position'; var element = goog.dom.createDom('DIV', className); @@ -68,7 +69,7 @@ ol.control.MousePosition = function(opt_options) { * @private * @type {string} */ - this.undefinedHTML_ = options.undefinedHTML ? options.undefinedHTML : ''; + this.undefinedHTML_ = options.undefinedHTML !== undefined ? options.undefinedHTML : ''; /** * @private From adb5b78cb6753dea1c2fa1acdfb9ebfdf7bab95b Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 10 Feb 2016 14:26:45 +0100 Subject: [PATCH 4/9] Fix checks for undefined in overviewmapcontrol --- src/ol/control/overviewmapcontrol.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ol/control/overviewmapcontrol.js b/src/ol/control/overviewmapcontrol.js index f050779dc9..020fc25d21 100644 --- a/src/ol/control/overviewmapcontrol.js +++ b/src/ol/control/overviewmapcontrol.js @@ -52,11 +52,11 @@ ol.control.OverviewMap = function(opt_options) { this.collapsed_ = false; } - var className = options.className ? options.className : 'ol-overviewmap'; + var className = options.className !== undefined ? options.className : 'ol-overviewmap'; - var tipLabel = options.tipLabel ? options.tipLabel : 'Overview map'; + var tipLabel = options.tipLabel !== undefined ? options.tipLabel : 'Overview map'; - var collapseLabel = options.collapseLabel ? options.collapseLabel : '\u00AB'; + var collapseLabel = options.collapseLabel !== undefined ? options.collapseLabel : '\u00AB'; /** * @private @@ -66,7 +66,7 @@ ol.control.OverviewMap = function(opt_options) { goog.dom.createDom('SPAN', {}, collapseLabel) : collapseLabel; - var label = options.label ? options.label : '\u00BB'; + var label = options.label !== undefined ? options.label : '\u00BB'; /** * @private From cf5006617cf34804f3321d0746e5bfb08de4ca51 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 10 Feb 2016 14:26:53 +0100 Subject: [PATCH 5/9] Fix checks for undefined in rotate control --- src/ol/control/rotatecontrol.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ol/control/rotatecontrol.js b/src/ol/control/rotatecontrol.js index 38e1375bde..e71f3c31c8 100644 --- a/src/ol/control/rotatecontrol.js +++ b/src/ol/control/rotatecontrol.js @@ -26,9 +26,9 @@ ol.control.Rotate = function(opt_options) { var options = opt_options ? opt_options : {}; - var className = options.className ? options.className : 'ol-rotate'; + var className = options.className !== undefined ? options.className : 'ol-rotate'; - var label = options.label ? options.label : '\u21E7'; + var label = options.label !== undefined ? options.label : '\u21E7'; /** * @type {Element} From 6c1d0f1bbe5669295e57981327c039ff88a09591 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 10 Feb 2016 14:27:02 +0100 Subject: [PATCH 6/9] Fix checks for undefined in scaline control --- src/ol/control/scalelinecontrol.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ol/control/scalelinecontrol.js b/src/ol/control/scalelinecontrol.js index 8cb122c6bd..7de1873943 100644 --- a/src/ol/control/scalelinecontrol.js +++ b/src/ol/control/scalelinecontrol.js @@ -55,7 +55,7 @@ ol.control.ScaleLine = function(opt_options) { var options = opt_options ? opt_options : {}; - var className = options.className ? options.className : 'ol-scale-line'; + var className = options.className !== undefined ? options.className : 'ol-scale-line'; /** * @private From b53d74285bdf3759a6eb7be8ccd31b60a94effd5 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 10 Feb 2016 14:27:10 +0100 Subject: [PATCH 7/9] Fix checks for undefined in zoom control --- src/ol/control/zoomcontrol.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ol/control/zoomcontrol.js b/src/ol/control/zoomcontrol.js index 7574fc4c2f..e840c66c24 100644 --- a/src/ol/control/zoomcontrol.js +++ b/src/ol/control/zoomcontrol.js @@ -24,16 +24,16 @@ ol.control.Zoom = function(opt_options) { var options = opt_options ? opt_options : {}; - var className = options.className ? options.className : 'ol-zoom'; + var className = options.className !== undefined ? options.className : 'ol-zoom'; - var delta = options.delta ? options.delta : 1; + var delta = options.delta !== undefined ? options.delta : 1; - var zoomInLabel = options.zoomInLabel ? options.zoomInLabel : '+'; - var zoomOutLabel = options.zoomOutLabel ? options.zoomOutLabel : '\u2212'; + var zoomInLabel = options.zoomInLabel !== undefined ? options.zoomInLabel : '+'; + var zoomOutLabel = options.zoomOutLabel !== undefined ? options.zoomOutLabel : '\u2212'; - var zoomInTipLabel = options.zoomInTipLabel ? + var zoomInTipLabel = options.zoomInTipLabel !== undefined ? options.zoomInTipLabel : 'Zoom in'; - var zoomOutTipLabel = options.zoomOutTipLabel ? + var zoomOutTipLabel = options.zoomOutTipLabel !== undefined ? options.zoomOutTipLabel : 'Zoom out'; var inElement = goog.dom.createDom('BUTTON', { From 4722d341af92b3e8cd3648ab046fe52c4e918352 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 10 Feb 2016 14:27:21 +0100 Subject: [PATCH 8/9] Fix checks for undefined in zoomslidercontrol --- src/ol/control/zoomslidercontrol.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ol/control/zoomslidercontrol.js b/src/ol/control/zoomslidercontrol.js index a68dc1a140..8af69d8a2c 100644 --- a/src/ol/control/zoomslidercontrol.js +++ b/src/ol/control/zoomslidercontrol.js @@ -98,7 +98,7 @@ ol.control.ZoomSlider = function(opt_options) { */ this.duration_ = options.duration !== undefined ? options.duration : 200; - var className = options.className ? options.className : 'ol-zoomslider'; + var className = options.className !== undefined ? options.className : 'ol-zoomslider'; var thumbElement = goog.dom.createDom('BUTTON', { 'type': 'button', 'class': className + '-thumb ' + ol.css.CLASS_UNSELECTABLE From 3e9683d88dca1e11748d4b808842703ea8bea8bc Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 10 Feb 2016 14:27:34 +0100 Subject: [PATCH 9/9] Fix checks for undefined in zoomtoextentcontrol --- src/ol/control/zoomtoextentcontrol.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ol/control/zoomtoextentcontrol.js b/src/ol/control/zoomtoextentcontrol.js index 28be2a3be1..017850bb78 100644 --- a/src/ol/control/zoomtoextentcontrol.js +++ b/src/ol/control/zoomtoextentcontrol.js @@ -27,11 +27,11 @@ ol.control.ZoomToExtent = function(opt_options) { */ this.extent_ = options.extent ? options.extent : null; - var className = options.className ? options.className : + var className = options.className !== undefined ? options.className : 'ol-zoom-extent'; - var label = options.label ? options.label : 'E'; - var tipLabel = options.tipLabel ? + var label = options.label !== undefined ? options.label : 'E'; + var tipLabel = options.tipLabel !== undefined ? options.tipLabel : 'Fit to extent'; var button = goog.dom.createDom('BUTTON', { 'type': 'button',