Merge branch 'master' into default_image_src

* master: remove method changed for scalebar (rstudio#547)
schloerke · May 15, 2018 · 01632fe · 01632fe
2 parents bad26de + 6fdf2bd
commit 01632fe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -7,6 +7,8 @@ BUG FIXES
 
 
 * `.leaflet-map-pane` `z-index` switched to 'auto'. Allows for map panes to appear above the map if they appear later in the dom. (#537)
+* Use correct Leaflet.js scale control remove method (#547)
+
 
 leaflet 2.0.0
 --------------------------------------------------------------------------------

diff --git a/inst/htmlwidgets/leaflet.js b/inst/htmlwidgets/leaflet.js
@@ -2064,7 +2064,7 @@ methods.addScaleBar = function (options) {
 
 methods.removeScaleBar = function () {
   if (this.currentScaleBar) {
-    this.currentScaleBar.removeFrom(this);
+    this.currentScaleBar.remove();
     this.currentScaleBar = null;
   }
 };

diff --git a/javascript/src/methods.js b/javascript/src/methods.js
@@ -896,7 +896,7 @@ methods.addScaleBar = function(options) {
 
 methods.removeScaleBar = function() {
   if (this.currentScaleBar) {
-    this.currentScaleBar.removeFrom(this);
+    this.currentScaleBar.remove();
     this.currentScaleBar = null;
   }
 };