Merge commit 'rick/t506' into 0.6

annasob · May 10, 2011 · 7a2c071 · 7a2c071
2 parents 180f4c1 + 918d6f2
commit 7a2c071
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/plugins/googlemap/popcorn.googlemap.js b/plugins/googlemap/popcorn.googlemap.js
@@ -128,9 +128,11 @@ var googleCallback;
         // ensure the map has been initialized in the setup function above
         var isMapSetup = function () {
           if ( map ) {
-            map.getDiv().style.display = "block";
-            // reset the location and zoom just in case the user plaid with the map
-            map.setCenter(location);
+            map.getDiv().style.display = "block";                               
+
+            // reset the location and zoom just in case the user manually moved the map
+						google.maps.event.trigger(map, "resize");
+            map.setCenter(location);       
 
             // make sure options.zoom is a number
             if ( options.zoom && typeof options.zoom !== "number" ) {
@@ -149,8 +151,6 @@ var googleCallback;
               options.pitch = +options.pitch;
             }
 
-            google.maps.event.trigger(map, 'resize');
-
             if ( options.type === "STREETVIEW" ) {
               // Switch this map into streeview mode
               map.setStreetView(