[Commits] r912 - apps/opengeo/geoexplorer/trunk/lib

[commits at geoext.org]

Author: dwins
Date: 2009-05-29 22:02:31 +0200 (Fri, 29 May 2009)
New Revision: 912

Modified:
   apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js
Log:
Fix #223, temporary layer from measure tool included in export wizard.
Also, set info title to layer name when title is empty.


Modified: apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js
===================================================================
--- apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js	2009-05-29 19:52:44 UTC (rev 911)
+++ apps/opengeo/geoexplorer/trunk/lib/GeoExplorer.js	2009-05-29 20:02:31 UTC (rev 912)
@@ -731,7 +731,7 @@
                     layers: [x.get("layer")],
                     eventListeners: {
                         getfeatureinfo: function(evt) {
-                            gx.displayPopup(evt, x.get("title"));
+                            gx.displayPopup(evt, x.get("title") || x.get("name"));
                         },
                         scope: gx 
                     }
@@ -1043,16 +1043,17 @@
         config.map.layers = [];
 
         this.layers.each(function(layerRecord){
+            if (layerRecord.get('layer').displayInLayerSwitcher) {
+                var c = {
+                    title: layerRecord.get("title"),
+                    name: (layerRecord.get("layer").params && 
+                        layerRecord.get("layer").params.LAYERS) || 
+                        layerRecord.get("name"),
+                    visibility: layerRecord.get("layer").getVisibility()
+                };
 
-            var c = {
-                title: layerRecord.get("title"),
-                name: (layerRecord.get("layer").params && 
-                    layerRecord.get("layer").params.LAYERS) || 
-                    layerRecord.get("name"),
-                visibility: layerRecord.get("layer").getVisibility()
-            };
-
-            config.map.layers.push(c);
+                config.map.layers.push(c);
+            }
         });
 
         return config;