[Commits] r802 - sandbox/bartvde/legend2/geoext/lib/GeoExt/widgets

[commits at geoext.org]

Author: bartvde
Date: 2009-05-18 09:55:55 +0200 (Mon, 18 May 2009)
New Revision: 802

Modified:
   sandbox/bartvde/legend2/geoext/lib/GeoExt/widgets/LegendPanel.js
Log:
hide mainPanel instead of not creating it

Modified: sandbox/bartvde/legend2/geoext/lib/GeoExt/widgets/LegendPanel.js
===================================================================
--- sandbox/bartvde/legend2/geoext/lib/GeoExt/widgets/LegendPanel.js	2009-05-18 07:35:31 UTC (rev 801)
+++ sandbox/bartvde/legend2/geoext/lib/GeoExt/widgets/LegendPanel.js	2009-05-18 07:55:55 UTC (rev 802)
@@ -203,11 +203,10 @@
      */
     createLegendSubpanel: function(record) {
         var layer = record.get('layer');
-        var mainPanel = null;
+        var mainPanel = this.createMainPanel(record);
         // the default legend can be overridden by specifying a
         // legendURL property
         if (record.get('legendURL')) {
-            mainPanel = this.createMainPanel(record);
             var legend = new GeoExt.legend.Image({url:
                 record.get('legendURL')});
             mainPanel.add(legend);
@@ -215,7 +214,6 @@
             var legendGenerator = GeoExt.legend[layer.CLASS_NAME.replace(
                 'OpenLayers.Layer.', '')];
             if (legendGenerator) {
-                mainPanel = this.createMainPanel(record);
                 var legend = new legendGenerator({layer: layer});
                 mainPanel.add(legend);
             }
@@ -236,7 +234,12 @@
         var hideInLegend = record.get('hideInLegend');
         var legendSubpanel = this.createLegendSubpanel(record);
         if (legendSubpanel !== null) {
-            legendSubpanel.setVisible((layer && layer.getVisibility() && !hideInLegend));
+            var items = legendSubpanel.findByType('gx_legendimage');
+            if (items.length == 0) {
+                legendSubpanel.hide();
+            } else {
+                legendSubpanel.setVisible((layer && layer.getVisibility() && !hideInLegend));
+            }
             if (this.ascending) {
                 this.add(legendSubpanel);
             } else {