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

[commits at geoext.org]

Author: bbinet
Date: 2011-10-05 15:49:19 +0200 (Wed, 05 Oct 2011)
New Revision: 2850

Modified:
   core/trunk/geoext/lib/GeoExt/widgets/Popup.js
   core/trunk/geoext/tests/lib/GeoExt/widgets/Popup.html
Log:
fix regression introduced in r2841: an exception occurred when the popup was created while the mappanel was not rendered yet. r=bartvde (closes #408)

Modified: core/trunk/geoext/lib/GeoExt/widgets/Popup.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/widgets/Popup.js	2011-10-05 11:13:24 UTC (rev 2849)
+++ core/trunk/geoext/lib/GeoExt/widgets/Popup.js	2011-10-05 13:49:19 UTC (rev 2850)
@@ -144,8 +144,9 @@
             this.location = this.map.getLonLatFromViewPortPx(this.location);
         }
 
-        if (this.location) {
-            this.insideViewport = this.map.getExtent().containsLonLat(this.location);
+        var mapExtent =  this.map.getExtent();
+        if (mapExtent && this.location) {
+            this.insideViewport = mapExtent.containsLonLat(this.location);
         }
 
         if(this.anchored) {

Modified: core/trunk/geoext/tests/lib/GeoExt/widgets/Popup.html
===================================================================
--- core/trunk/geoext/tests/lib/GeoExt/widgets/Popup.html	2011-10-05 11:13:24 UTC (rev 2849)
+++ core/trunk/geoext/tests/lib/GeoExt/widgets/Popup.html	2011-10-05 13:49:19 UTC (rev 2850)
@@ -9,13 +9,13 @@
 
     <script type="text/javascript">
 
-        function setupContext() {        
+        function setupContext(options) {        
 
             var map = new OpenLayers.Map({panMethod: null}); // avoid tween panning for tests
             var layer = new OpenLayers.Layer("test", {isBaseLayer: true});
             map.addLayer(layer);
 
-            var mapPanel = new GeoExt.MapPanel({
+            var mapPanel = new GeoExt.MapPanel(Ext.apply({
                 // panel options
                 id: "map-panel",
                 title: "GeoExt MapPanel",
@@ -26,7 +26,7 @@
                 map: map,
                 center: new OpenLayers.LonLat(5, 45),
                 zoom: 4
-            });
+            }, options));
 
             var feature = new OpenLayers.Feature.Vector(
                 new OpenLayers.Geometry.Point(5,45),
@@ -50,16 +50,38 @@
             context.mapPanel.destroy();
         }
 
-        function popup(feature, map, hide) {
-            return new GeoExt.Popup({
+        function popup(feature, map, options) {
+            return new GeoExt.Popup(Ext.apply({
                 title: 'My Popup',
                 location: feature,
                 map: map,
                 width: 200,
                 html: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit.",
                 collapsible: true,
-                closeAction: (hide) ? "hide" : "close"     // Default action is "close"
+                closeAction: "close"     // Default action is "close"
+            }, options));
+        }
+
+        function test_beforemaprendered(t) {
+            t.plan(1);
+
+            var pop;
+            var context = setupContext({
+                listeners: {
+                    beforerender: function() {
+                        pop = popup(new OpenLayers.LonLat(5, 45), this.map, {
+                            manager: Ext.WindowMgr
+                        });
+                        return true;
+                    }
+                }
             });
+
+            pop.show();
+
+            t.ok(Ext.getBody().child("div." + pop.popupCls),"viewport contains popup");
+
+            tearDown(context);
         }
 
         function test_addtomappanel(t) {
@@ -241,7 +263,9 @@
             var context = setupContext();
             
             // Reusable popup (closeAction = hide)
-            var pop = popup(context.feature,null,true);
+            var pop = popup(context.feature, null, {
+                closeAction: 'hide'
+            });
             
             pop.show();