From 03a5e482c3c0d99dadab2f4068538959acbda112 Mon Sep 17 00:00:00 2001 From: Matt Walker Date: Sat, 18 Oct 2014 19:50:31 +0100 Subject: [PATCH] Minor jshint fixes --- examples/layerswitcher.js | 1 + src/ol3-layerswitcher.js | 18 +++++++++--------- test/spec/ol3-layerswitcher.js | 8 ++++---- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/examples/layerswitcher.js b/examples/layerswitcher.js index 5658a63..e8aa32a 100644 --- a/examples/layerswitcher.js +++ b/examples/layerswitcher.js @@ -40,4 +40,5 @@ var layerSwitcher = new ol.control.LayerSwitcher(); map.addControl(layerSwitcher); + })(); diff --git a/src/ol3-layerswitcher.js b/src/ol3-layerswitcher.js index f7ffe5a..049f671 100644 --- a/src/ol3-layerswitcher.js +++ b/src/ol3-layerswitcher.js @@ -85,20 +85,21 @@ ol.control.LayerSwitcher.prototype.renderLayer = function(lyr, idx) { var lyrId = lyr.get('title').replace(' ', '-') + '_' + idx; + var label = document.createElement('label'); + if (lyr.getLayers) { li.className = 'group'; - var label = document.createElement('label'); label.innerHTML = lyr.get('title'); li.appendChild(label); var ul = document.createElement('ul'); li.appendChild(ul); var lyrs = lyr.getLayers().getArray().slice().reverse(); - for (var idx = 0, lyr; idx < lyrs.length; idx++) { - lyr = lyrs[idx]; + for (var i = 0, l; i < lyrs.length; i++) { + l = lyrs[i]; if (lyr.get('title')) { - ul.appendChild(this_.renderLayer(lyr, idx)); + ul.appendChild(this_.renderLayer(l, i)); } } @@ -118,7 +119,6 @@ ol.control.LayerSwitcher.prototype.renderLayer = function(lyr, idx) { }; li.appendChild(input); - var label = document.createElement('label'); label.htmlFor = lyrId; label.innerHTML = lyr.get('title'); li.appendChild(label); @@ -141,10 +141,10 @@ ol.control.LayerSwitcher.prototype.render = function(map) { this.panel.appendChild(ul); var lyrs = map.getLayers().getArray().slice().reverse(); - for (var idx = 0, lyr; idx < lyrs.length; idx++) { - lyr = lyrs[idx]; - if (lyr.get('title')) { - ul.appendChild(this_.renderLayer(lyr, idx)); + for (var i = 0, l; i < lyrs.length; i++) { + l = lyrs[i]; + if (l.get('title')) { + ul.appendChild(this_.renderLayer(l, i)); } } diff --git a/test/spec/ol3-layerswitcher.js b/test/spec/ol3-layerswitcher.js index f5ff9c1..5dbc5c7 100644 --- a/test/spec/ol3-layerswitcher.js +++ b/test/spec/ol3-layerswitcher.js @@ -89,28 +89,28 @@ describe('ol.control.LayerSwitcher', function() { it('displays all layers with a title in reverse order', function() { switcher.showPanel(); var titles = jQuery('.layer-switcher label').map(function() { - return jQuery(this).text() + return jQuery(this).text(); }).get(); expect(titles).to.eql(['Bar', 'Base', 'Too', 'Foo']); }); it('displays normal layers as checkbox', function() { switcher.showPanel(); var titles = jQuery('.layer-switcher input[type=checkbox]').siblings('label').map(function() { - return jQuery(this).text() + return jQuery(this).text(); }).get(); expect(titles).to.eql(['Bar']); }); it('displays base layers as radio buttons', function() { switcher.showPanel(); var titles = jQuery('.layer-switcher input[type=radio]').siblings('label').map(function() { - return jQuery(this).text() + return jQuery(this).text(); }).get(); expect(titles).to.eql(['Too', 'Foo']); }); it('should display groups without an input', function() { switcher.showPanel(); var titles = jQuery('.layer-switcher label:not([for])').map(function() { - return jQuery(this).text() + return jQuery(this).text(); }).get(); expect(titles).to.eql(['Base']); expect(jQuery('.layer-switcher label:not([for])').siblings('input').length).to.be(0);