Permalink
Browse files

Merge commit '2d08c24512' into 0.2

  • Loading branch information...
2 parents a0927ee + 2d08c24 commit aabd1f6965d27d37740dbc98e4700cee15567206 @annasob annasob committed Jan 12, 2011
Showing with 5 additions and 6 deletions.
  1. +5 −6 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 );
}
};

0 comments on commit aabd1f6

Please sign in to comment.