fix layers control factory and update build

danzel · Jul 26, 2012 · 2df0a4c · 2df0a4c
1 parent 19ed185
commit 2df0a4c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/dist/leaflet-src.js b/dist/leaflet-src.js
@@ -2525,6 +2525,7 @@ L.ImageOverlay = L.Class.extend({
 		return this;
 	},
 
+	// TODO remove bringToFront/bringToBack duplication from TileLayer/Path
 	bringToFront: function () {
 		if (this._image) {
 			this._map._panes.overlayPane.appendChild(this._image);
@@ -6737,10 +6738,11 @@ L.Control.Layers = L.Control.extend({
 	}
 });
 
-L.control.layers = function (options) {
-	return new L.Control.Layers(options);
+L.control.layers = function (baseLayers, overlays, options) {
+	return new L.Control.Layers(baseLayers, overlays, options);
 };
 
+
 L.Transition = L.Class.extend({
 	includes: L.Mixin.Events,
 
@@ -7283,10 +7285,11 @@ L.Map.include({
 		options = this._locationOptions = L.Util.extend(this._defaultLocateOptions, options);
 
 		if (!navigator.geolocation) {
-			return this.fire('locationerror', {
+			this._handleGeolocationError({
 				code: 0,
 				message: "Geolocation not supported."
 			});
+			return this;
 		}
 
 		var onResponse = L.Util.bind(this._handleGeolocationResponse, this),
@@ -7309,7 +7312,7 @@ L.Map.include({
 
 	_handleGeolocationError: function (error) {
 		var c = error.code,
-			message =
+			message = error.message ||
 				(c === 1 ? "permission denied" :
 				(c === 2 ? "position unavailable" : "timeout"));
 

diff --git a/dist/leaflet.js b/dist/leaflet.js
diff --git a/src/control/Control.Layers.js b/src/control/Control.Layers.js
@@ -173,6 +173,6 @@ L.Control.Layers = L.Control.extend({
 	}
 });
 
-L.control.layers = function (options) {
-	return new L.Control.Layers(options);
-};
+L.control.layers = function (baseLayers, overlays, options) {
+	return new L.Control.Layers(baseLayers, overlays, options);
+};