Merge pull request #1575 from akatsoulas/fix-map

[bug 1254083][regression] Invalidate map size.
mozilla · Jan 10, 2017 · 1bcd324 · 1bcd324
2 parents 4ad99bc + b8059e4
commit 1bcd324
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/mozillians/jinja2/phonebook/edit_profile.html b/mozillians/jinja2/phonebook/edit_profile.html
@@ -6,7 +6,7 @@
 {% block body_id %}edit-profile{% endblock %}
 
 {% block extrahead %}
-  <link href="https://api.tiles.mapbox.com/mapbox.js/v1.6.2/mapbox.css"
+  <link href="https://api.tiles.mapbox.com/mapbox.js/v1.6.6/mapbox.css"
         type="text/css" rel="stylesheet" media="screen" />
   {{ registration_form.media.css }}
 {% endblock extrahead %}
@@ -94,7 +94,7 @@
 
 {% block page_js %}
   <script src="https://www.google.com/recaptcha/api.js" async defer></script>
-  <script src="https://api.tiles.mapbox.com/mapbox.js/v1.6.2/mapbox.js"></script>
+  <script src="https://api.tiles.mapbox.com/mapbox.js/v1.6.6/mapbox.js"></script>
   {% compress js %}
     <script src="{{ static('mozillians/js/libs/URI.js') }}"></script>
     <script src="{{ static('mozillians/js/libs/tag-it/js/tag-it.js') }}"></script>

diff --git a/mozillians/static/mozillians/js/profile_edit_mapbox.js b/mozillians/static/mozillians/js/profile_edit_mapbox.js
@@ -314,6 +314,11 @@
         selectSearchResult(this.datum);
     });
 
+    // hack to fix the broken map from bootstrap
+    $('#mylocation-tab').on('shown.bs.tab', function() {
+        map.invalidateSize(true);
+    });
+
     search_el.on('keydown changed', function(event){
         clearTimeout(keystrokeTimer);
         if(event.keyCode === 13){ // enter