have the margin-right be align with the labelPadding and remove the a…

…dded space in the icon NA label
schloerke · Mar 27, 2018 · a7272b6 · a7272b6
1 parent 5aa8ef6
commit a7272b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/inst/htmlwidgets/leaflet.js b/inst/htmlwidgets/leaflet.js
@@ -1883,7 +1883,7 @@ methods.addLegend = function (options) {
         });
 
         if (options.na_color && _jquery2.default.inArray(options.na_label, labels) < 0) {
-          (0, _jquery2.default)(div).append("<div><i style=\"background:" + options.na_color + ";opacity:" + options.opacity + ";\"></i> " + options.na_label + "</div>");
+          (0, _jquery2.default)(div).append("<div><i style=\"" + "background:" + options.na_color + ";opacity:" + options.opacity + ";margin-right:" + labelPadding + "px" + ";\"></i>" + options.na_label + "</div>");
         }
       })();
     } else {

diff --git a/javascript/src/methods.js b/javascript/src/methods.js
@@ -789,9 +789,11 @@ methods.addLegend = function(options) {
       });
 
       if (options.na_color && ($.inArray(options.na_label, labels)<0) ) {
-        $(div).append("<div><i style=\"background:" + options.na_color +
+        $(div).append("<div><i style=\"" +
+                      "background:" + options.na_color +
                       ";opacity:" + options.opacity +
-                      ";\"></i> " + options.na_label + "</div>");
+                      ";margin-right:" + labelPadding + "px" +
+                      ";\"></i>" + options.na_label + "</div>");
       }
     } else {
       if (options.na_color && ($.inArray(options.na_label, labels)<0) ) {