remove method changed for scalebar (#547)

schloerke · web-flow · commit 6fdf2bd46a3b · 2018-05-15T13:36:23.000-04:00
* remove method changed for scalebar

* add news line about remove scalebar fix
diff --git a/NEWS b/NEWS
@@ -4,6 +4,8 @@ leaflet 2.0.0.9000
 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
@@ -2058,7 +2058,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;
   }
 };

Original file line number	Diff line number	Diff line change
`@@ -2058,7 +2058,7 @@ methods.addScaleBar = function (options) {`
`2058`	`2058`
`2059`	`2059`	`methods.removeScaleBar = function () {`
`2060`	`2060`	`if (this.currentScaleBar) {`
`2061`		`- this.currentScaleBar.removeFrom(this);`
	`2061`	`+ this.currentScaleBar.remove();`
`2062`	`2062`	`this.currentScaleBar = null;`
`2063`	`2063`	`}`
`2064`	`2064`	`};`
Original file line number	Diff line number	Diff line change
`@@ -896,7 +896,7 @@ methods.addScaleBar = function(options) {`
`896`	`896`
`897`	`897`	`methods.removeScaleBar = function() {`
`898`	`898`	`if (this.currentScaleBar) {`
`899`		`- this.currentScaleBar.removeFrom(this);`
	`899`	`+ this.currentScaleBar.remove();`
`900`	`900`	`this.currentScaleBar = null;`
`901`	`901`	`}`
`902`	`902`	`};`