Commit c945f214 authored by Serge S. Koval's avatar Serge S. Koval

Merge pull request #1235 from erm0l0v/fix-https

Geo widget doesn't work by https #1234
parents 0dcbb130 12a21330
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
} }
} else { } else {
// look up user's location by IP address // look up user's location by IP address
$.getJSON("http://ip-api.com/json/?callback=?", function(data) { $.getJSON("//ip-api.com/json/?callback=?", function(data) {
map.setView([data["lat"], data["lon"]], 12); map.setView([data["lat"], data["lon"]], 12);
}).fail(function() { }).fail(function() {
map.setView([0, 0], 1) map.setView([0, 0], 1)
...@@ -158,8 +158,8 @@ ...@@ -158,8 +158,8 @@
// set up tiles // set up tiles
var mapboxVersion = window.MAPBOX_ACCESS_TOKEN ? 4 : 3; var mapboxVersion = window.MAPBOX_ACCESS_TOKEN ? 4 : 3;
L.tileLayer('http://{s}.tiles.mapbox.com/v'+mapboxVersion+'/'+MAPBOX_MAP_ID+'/{z}/{x}/{y}.png?access_token='+window.MAPBOX_ACCESS_TOKEN, { L.tileLayer('//{s}.tiles.mapbox.com/v'+mapboxVersion+'/'+MAPBOX_MAP_ID+'/{z}/{x}/{y}.png?access_token='+window.MAPBOX_ACCESS_TOKEN, {
attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a>', attribution: 'Map data &copy; <a href="//openstreetmap.org">OpenStreetMap</a> contributors, <a href="//creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="//mapbox.com">Mapbox</a>',
maxZoom: 18 maxZoom: 18
}).addTo(map); }).addTo(map);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment