Fix #424: incorrect opacity on NA entry in legend

jcheng5 · jcheng5 · commit ca5eedb5f81f · 2017-05-03T23:49:50.000-07:00
diff --git a/inst/htmlwidgets/leaflet.js b/inst/htmlwidgets/leaflet.js
@@ -1839,7 +1839,7 @@ methods.addLegend = function (options) {
         });
 
         if (options.na_color) {
-          (0, _jquery2.default)(div).append("<div><i style=\"background:" + options.na_color + "\"></i> " + options.na_label + "</div>");
+          (0, _jquery2.default)(div).append("<div><i style=\"background:" + options.na_color + ";opacity:" + options.opacity + ";\"></i> " + options.na_label + "</div>");
         }
       })();
     } else {
diff --git a/javascript/src/methods.js b/javascript/src/methods.js
@@ -774,7 +774,8 @@ methods.addLegend = function(options) {
 
       if (options.na_color) {
         $(div).append("<div><i style=\"background:" + options.na_color +
-                      "\"></i> " + options.na_label + "</div>");
+                      ";opacity:" + options.opacity +
+                      ";\"></i> " + options.na_label + "</div>");
       }
     } else {
       if (options.na_color) {

Original file line number	Diff line number	Diff line change
`@@ -1839,7 +1839,7 @@ methods.addLegend = function (options) {`
`1839`	`1839`	`});`
`1840`	`1840`
`1841`	`1841`	`if (options.na_color) {`
`1842`		`- (0, _jquery2.default)(div).append("<div><i style=\"background:" + options.na_color + "\"></i> " + options.na_label + "</div>");`
	`1842`	`+ (0, _jquery2.default)(div).append("<div><i style=\"background:" + options.na_color + ";opacity:" + options.opacity + ";\"></i> " + options.na_label + "</div>");`
`1843`	`1843`	`}`
`1844`	`1844`	`})();`
`1845`	`1845`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -774,7 +774,8 @@ methods.addLegend = function(options) {`
`774`	`774`
`775`	`775`	`if (options.na_color) {`
`776`	`776`	`$(div).append("<div><i style=\"background:" + options.na_color +`
`777`		`- "\"></i> " + options.na_label + "</div>");`
	`777`	`+ ";opacity:" + options.opacity +`
	`778`	`+ ";\"></i> " + options.na_label + "</div>");`
`778`	`779`	`}`
`779`	`780`	`} else {`
`780`	`781`	`if (options.na_color) {`