archive-gh-me/ol-layerswitcher
1
0
Fork 0
mirror of https://github.com/walkermatt/ol-layerswitcher.git synced 2026-02-01 15:56:51 +00:00
Code Issues Projects Releases Wiki Activity

Minor jshint fixes

Browse Source
This commit is contained in:
Matt Walker 2014-10-18 19:50:31 +01:00
parent 0be8bae6f2
commit 03a5e482c3
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/layerswitcher.js
View File

@ -40,4 +40,5 @@
var layerSwitcher = new ol.control.LayerSwitcher();
map.addControl(layerSwitcher);
})();

18
src/ol3-layerswitcher.js
View File

@ -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));
}
}

8
test/spec/ol3-layerswitcher.js
View File

@ -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);