Merge pull request #1055 from aparshin/layers-control-html

Allow HTML in Layer Names (issue #1009)
Leaflet · Oct 15, 2012 · 09060ff · 09060ff
2 parents 2482592 + cb44a6b
commit 09060ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/dist/leaflet.css b/dist/leaflet.css
@@ -122,7 +122,7 @@
 .leaflet-control-zoom a {
 	background-color: rgba(255, 255, 255, 0.75);
 	}
-.leaflet-control-zoom a, .leaflet-control-layers a {
+.leaflet-control-zoom a, .leaflet-control-layers-toggle {
 	background-position: 50% 50%;
 	background-repeat: no-repeat;
 	display: block;
@@ -156,12 +156,12 @@
 	-webkit-border-radius: 8px;
 	border-radius: 8px;
 	}
-.leaflet-control-layers a {
+.leaflet-control-layers-toggle {
 	background-image: url(images/layers.png);
 	width: 36px;
 	height: 36px;
 	}
-.leaflet-touch .leaflet-control-layers a {
+.leaflet-touch .leaflet-control-layers-toggle {
 	width: 44px;
 	height: 44px;
 	}
@@ -179,7 +179,7 @@
 	color: #333;
 	background: #fff;
 	}
-.leaflet-control-layers input {
+.leaflet-control-layers-selector {
 	margin-top: 2px;
 	position: relative;
 	top: 1px;

diff --git a/src/control/Control.Layers.js b/src/control/Control.Layers.js
@@ -135,7 +135,7 @@ L.Control.Layers = L.Control.extend({
 	// IE7 bugs out if you create a radio dynamically, so you have to do it this hacky way (see http://bit.ly/PqYLBe)
 	_createRadioElement: function (name, checked) {
 
-		var radioHtml = '<input type="radio" name="' + name + '"';
+		var radioHtml = '<input type="radio" class="leaflet-control-layers-selector" name="' + name + '"';
 		if (checked) {
 			radioHtml += ' checked="checked"';
 		}
@@ -155,6 +155,7 @@ L.Control.Layers = L.Control.extend({
 		if (obj.overlay) {
 			input = document.createElement('input');
 			input.type = 'checkbox';
+			input.className = 'leaflet-control-layers-selector';
 			input.defaultChecked = checked;
 		} else {
 			input = this._createRadioElement('leaflet-base-layers', checked);
@@ -164,7 +165,8 @@ L.Control.Layers = L.Control.extend({
 
 		L.DomEvent.on(input, 'click', this._onInputClick, this);
 
-		var name = document.createTextNode(' ' + obj.name);
+		var name = document.createElement('span');
+		name.innerHTML = ' ' + obj.name;
 
 		label.appendChild(input);
 		label.appendChild(name);