Merge remote-tracking branch 'refs/remotes/origin/develop'

Raruto · Apr 7, 2019 · 6356bc2 · 6356bc2
2 parents 0f386c9 + e2274f2
commit 6356bc2
Show file tree

Hide file tree

Showing 8 changed files with 286 additions and 2 deletions.
diff --git a/images/elevation-lime.png b/images/elevation-lime.png
diff --git a/images/elevation-lime.svg b/images/elevation-lime.svg
diff --git a/images/elevation-purple.png b/images/elevation-purple.png
diff --git a/images/elevation-purple.svg b/images/elevation-purple.svg
diff --git a/images/elevation-steelblue.png b/images/elevation-steelblue.png
diff --git a/images/elevation-steelblue.svg b/images/elevation-steelblue.svg
diff --git a/images/elevation.png b/images/elevation.png
diff --git a/leaflet-elevation.js b/leaflet-elevation.js
@@ -927,14 +927,19 @@ L.Control.Elevation = L.Control.extend({
 		eleDiv.appendChild(container);
 	},
 
-	loadGPX: function(map, url) {
-		if (this.options.detachedView) {
+	loadChart: function(map) {
+    if (this.options.detachedView) {
 			this._addToElevationDiv(map);
 		} else {
 			this.addTo(map);
 		}
+  },
+
+	loadGPX: function(map, url) {
+		this.loadChart(map);
 		this.addGPXFile(url);
 	}
+
 });
 
 L.control.elevation = function(options) {