[Commits] r2146 - in sandbox/bartvde/playground/geoext: examples lib/GeoExt/widgets

[commits at geoext.org]

Author: bartvde
Date: 2010-04-29 16:10:09 +0200 (Thu, 29 Apr 2010)
New Revision: 2146

Modified:
   sandbox/bartvde/playground/geoext/examples/wms-tree.js
   sandbox/bartvde/playground/geoext/lib/GeoExt/widgets/WMSPreviewPanel.js
Log:
restore add layer functionality in example

Modified: sandbox/bartvde/playground/geoext/examples/wms-tree.js
===================================================================
--- sandbox/bartvde/playground/geoext/examples/wms-tree.js	2010-04-29 13:48:39 UTC (rev 2145)
+++ sandbox/bartvde/playground/geoext/examples/wms-tree.js	2010-04-29 14:10:09 UTC (rev 2146)
@@ -14,7 +14,6 @@
                 'click': function(node) { 
                     if (node.attributes.layer !== null) {
                         previewPanel.showPreview(node.attributes.layer);
-                        //mapPanel.map.addLayer(node.attributes.layer); 
                     }
                 }
             }
@@ -63,7 +62,12 @@
                     },
                     items: [
                         tree,
-                        previewPanel
+                        previewPanel,
+                        {xtype: 'toolbar', items: [{text: "Add layer", handler: function() {
+                            if (previewPanel.currentLayer) {
+                                mapPanel.map.addLayer(previewPanel.currentLayer);
+                            }
+                        } }]}
                     ],
                     width: 250,
                     split: true

Modified: sandbox/bartvde/playground/geoext/lib/GeoExt/widgets/WMSPreviewPanel.js
===================================================================
--- sandbox/bartvde/playground/geoext/lib/GeoExt/widgets/WMSPreviewPanel.js	2010-04-29 13:48:39 UTC (rev 2145)
+++ sandbox/bartvde/playground/geoext/lib/GeoExt/widgets/WMSPreviewPanel.js	2010-04-29 14:10:09 UTC (rev 2146)
@@ -5,6 +5,11 @@
 
 Ext.extend(GeoExt.WMSPreviewPanel, Ext.Panel, {
 
+    /* begin i18n */
+    /** api: config[waitText] ``String`` i18n */
+    waitText: "Retrieving preview image",
+    /* end i18n */
+
     currentLayer: null,
 
     initComponent: function() {
@@ -28,8 +33,7 @@
 
     showMask: function() {
         if (!this.mask) {
-            this.mask = new Ext.LoadMask(this.getEl(), {
-                msg:  OpenLayers.i18n("WMSBrowserPreviewWaitMsg")});
+            this.mask = new Ext.LoadMask(this.getEl(), {msg:  this.waitText});
             Ext.EventManager.addListener(this.image.getEl(), 'load',
                 this.hideMask, this);
             Ext.EventManager.addListener(this.image.getEl(), 'error',
@@ -89,7 +93,10 @@
 
         // if the layer has not been added to the map yet, we need to set its
         // map property otherwise getFullRequestString will not work.
-        layer.map = this.map;
+        var noMap = (layer.map === null);
+        if (noMap === true) {
+            layer.map = this.map;
+        }
 
         var url = layer.getFullRequestString({
             BBOX: this.calculateBBOX(layer),
@@ -97,7 +104,9 @@
             HEIGHT: this.getHeight()
         });
 
-        layer.map = null;
+        if (noMap === true) {
+            layer.map = null;
+        }
 
         this.currentLayer = layer;
         this.image.getEl().dom.src = url;