Merge pull request #863 from kespindler/ks-fix-mapbox-v4

fix mapbox-v4

flask_admin/static/admin/js/form-1.0.0.js

@@ -78,10 +78,6 @@
           return false;
         }
 
-        if (!window.MAPBOX_ACCESS_TOKEN) {
-          console.warn("You must set MAPBOX_ACCESS_TOKEN in your Flask settings to use the map widget with mapbox v4 API");
-        }
-
         var geometryType = $el.data("geometry-type")
         if (geometryType) {
           geometryType = geometryType.toUpperCase();
@@ -159,7 +155,7 @@
         }
 
         // set up tiles
-        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, {
           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>',
           maxZoom: 18

flask_admin/templates/bootstrap2/admin/lib.html

@@ -188,7 +188,7 @@
   <script>
   window.MAPBOX_MAP_ID = "{{ config.MAPBOX_MAP_ID }}";
   {% if config.MAPBOX_ACCESS_TOKEN %}
-  window.MAPBOX_ACCESS_TOKEN = "{{ config.MAPBOX_MAP_ID }}";
+  window.MAPBOX_ACCESS_TOKEN = "{{ config.MAPBOX_ACCESS_TOKEN }}";
   {% endif %}
   </script>
   <script src="{{ admin_static.url(filename='vendor/leaflet/leaflet.js') }}"></script>

flask_admin/templates/bootstrap3/admin/lib.html

@@ -183,7 +183,7 @@
   <script>
   window.MAPBOX_MAP_ID = "{{ config.MAPBOX_MAP_ID }}";
   {% if config.MAPBOX_ACCESS_TOKEN %}
-  window.MAPBOX_ACCESS_TOKEN = "{{ config.MAPBOX_MAP_ID }}";
+  window.MAPBOX_ACCESS_TOKEN = "{{ config.MAPBOX_ACCESS_TOKEN }}";
   {% endif %}
   </script>
   <script src="{{ admin_static.url(filename='vendor/leaflet/leaflet.js') }}"></script>