Merge commit '2d08c24512' into 0.2

drigato · Jan 12, 2011 · aabd1f6 · aabd1f6
2 parents a0927ee + 2d08c24
commit aabd1f6
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/plugins/googlemap/popcorn.googlemap.js b/plugins/googlemap/popcorn.googlemap.js
@@ -126,13 +126,12 @@ var googleCallback;
             options._map.getDiv().style.display = 'block';
             // reset the location and zoom just in case the user plaid with the map
             options._map.setCenter(options._location);
-            if ( options.zoom ) {
-              if ( typeof options.zoom !== "number" ) {
-                options.zoom = +options.zoom;
-              } 
-            } else {
-              options.zoom = 0;
+
+            // make sure options.zoom is a number
+            if ( options.zoom && typeof options.zoom !== "number" ) {
+              options.zoom = +options.zoom;
             }
+            options.zoom = options.zoom || 0; // default to 0
             options._map.setZoom( options.zoom );
           }
         };