[Commits] r939 - in core/trunk/geoext: lib/GeoExt/widgets tests/lib/GeoExt/widgets

[commits at geoext.org]

Author: tschaub
Date: 2009-06-02 00:44:45 +0200 (Tue, 02 Jun 2009)
New Revision: 939

Modified:
   core/trunk/geoext/lib/GeoExt/widgets/MapPanel.js
   core/trunk/geoext/tests/lib/GeoExt/widgets/MapPanel.html
Log:
Allow zoom only to be provided in MapPanel config.  r=elemoine (closes #70)

Modified: core/trunk/geoext/lib/GeoExt/widgets/MapPanel.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/widgets/MapPanel.js	2009-06-01 22:37:37 UTC (rev 938)
+++ core/trunk/geoext/lib/GeoExt/widgets/MapPanel.js	2009-06-01 22:44:45 UTC (rev 939)
@@ -150,8 +150,8 @@
         map.setCenter = setCenter;
 
         if(map.layers.length > 0) {
-            if(this.center) {
-                // zoom does not have to be defined
+            if(this.center || this.zoom != null) {
+                // both do not have to be defined
                 map.setCenter(this.center, this.zoom);
             } else if(this.extent) {
                 map.zoomToExtent(this.extent);

Modified: core/trunk/geoext/tests/lib/GeoExt/widgets/MapPanel.html
===================================================================
--- core/trunk/geoext/tests/lib/GeoExt/widgets/MapPanel.html	2009-06-01 22:37:37 UTC (rev 938)
+++ core/trunk/geoext/tests/lib/GeoExt/widgets/MapPanel.html	2009-06-01 22:44:45 UTC (rev 939)
@@ -85,6 +85,24 @@
             
         }
 
+        function test_zoom(t) {
+            
+            t.plan(1);
+            
+            var panel = new GeoExt.MapPanel({
+                title: "GeoExt MapPanel",
+                renderTo: "mappanel",
+                height: 400,
+                width: 600,
+                layers: [new OpenLayers.Layer()],
+                zoom: 4
+            });
+            
+            t.eq(panel.map.zoom, 4, "zoom correctly set");
+            
+            panel.destroy();
+        }
+
         function test_extent(t) {
             
             t.plan(3);