fix markercluster permanent/noHide tooltip for L.tooltip

timelyportfolio · timelyportfolio · commit f448c7230b2f · 2017-03-14T09:30:08.000-05:00
diff --git a/R/layers.R b/R/layers.R
@@ -631,7 +631,7 @@ markerClusterDependencies <- function() {
   list(
     htmltools::htmlDependency(
       'leaflet-markercluster',
-      '0.5.0',
+      '1.0.4',
       system.file('htmlwidgets/plugins/Leaflet.markercluster', package = 'leaflet'),
       script = c('leaflet.markercluster.js', 'leaflet.markercluster.layersupport-src.js', 'leaflet.markercluster.freezable-src.js'),
       stylesheet = c('MarkerCluster.css', 'MarkerCluster.Default.css')
diff --git a/inst/htmlwidgets/leaflet.js b/inst/htmlwidgets/leaflet.js
@@ -1316,8 +1316,8 @@ function addMarkers(map, df, group, clusterOptions, clusterId, markerFunc) {
           var labelOptions = df.get(i, "labelOptions");
           if (label !== null) {
             if (labelOptions !== null) {
-              if (labelOptions.noHide) {
-                marker.bindTooltip(label, labelOptions).showLabel();
+              if (labelOptions.permanent) {
+                marker.bindTooltip(label, labelOptions).openTooltip();
               } else {
                 marker.bindTooltip(label, labelOptions);
               }
diff --git a/javascript/src/methods.js b/javascript/src/methods.js
@@ -166,7 +166,7 @@ function addMarkers(map, df, group, clusterOptions, clusterId, markerFunc) {
           if (label !== null) {
             if (labelOptions !== null) {
               if(labelOptions.permanent) {
-                marker.bindTooltip(label, labelOptions).showLabel();
+                marker.bindTooltip(label, labelOptions).openTooltip();
               } else {
                 marker.bindTooltip(label, labelOptions);
               }

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ function addMarkers(map, df, group, clusterOptions, clusterId, markerFunc) {`
`166`	`166`	`if (label !== null) {`
`167`	`167`	`if (labelOptions !== null) {`
`168`	`168`	`if(labelOptions.permanent) {`
`169`		`- marker.bindTooltip(label, labelOptions).showLabel();`
	`169`	`+ marker.bindTooltip(label, labelOptions).openTooltip();`
`170`	`170`	`} else {`
`171`	`171`	`marker.bindTooltip(label, labelOptions);`
`172`	`172`	`}`