[Commits] r2611 - in sandbox/mapgears/geoext.ux/ux/WMSBrowser: examples lib/GeoExt.ux/widgets

[commits at geoext.org]

Author: adube
Date: 2011-02-21 17:17:18 +0100 (Mon, 21 Feb 2011)
New Revision: 2611

Modified:
   sandbox/mapgears/geoext.ux/ux/WMSBrowser/examples/WMSBrowserInWindowExample.js
   sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/widgets/WMSBrowser.js
Log:
WMSBrowser - new 'proxyHost' property in order to use a unique proxy for this widget

Modified: sandbox/mapgears/geoext.ux/ux/WMSBrowser/examples/WMSBrowserInWindowExample.js
===================================================================
--- sandbox/mapgears/geoext.ux/ux/WMSBrowser/examples/WMSBrowserInWindowExample.js	2011-02-21 09:45:26 UTC (rev 2610)
+++ sandbox/mapgears/geoext.ux/ux/WMSBrowser/examples/WMSBrowserInWindowExample.js	2011-02-21 16:17:18 UTC (rev 2611)
@@ -72,6 +72,8 @@
             closeOnLayerAdded: false,
             allowInvalidUrl: true,
             alertPopupTimeout: 2000,
+            // === proxyHost === uncomment to use the local proxy.php
+            //proxyHost: "./proxy.php?url=",
             // comment the below line to have a 'textfield' instead of a 
             // 'combobox'.  oServerStore is in ./store.js
             serverStore: oServerStore,

Modified: sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/widgets/WMSBrowser.js
===================================================================
--- sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/widgets/WMSBrowser.js	2011-02-21 09:45:26 UTC (rev 2610)
+++ sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/widgets/WMSBrowser.js	2011-02-21 16:17:18 UTC (rev 2611)
@@ -259,6 +259,13 @@
      */
     alertPopupAutoHide: false,
 
+    /** api: config[proxyHost]
+     * ``String`` The url to a proxy to use for this widget only.  If not set,
+     *            it uses OpenLayers.ProxyHost instead (if set).
+     *            Example of value : "./proxy?url="
+     */
+    proxyHost: null,
+
     /** api: config[layerBrowserXtype]
      * ``String`` The xtype of layer browser to use (component on the left).
      *  Supported value are : 
@@ -632,7 +639,11 @@
         var params = OpenLayers.Util.getParameterString(this.capabilitiesParams);        
         url = OpenLayers.Util.urlAppend(url, params);
 
-        if (OpenLayers.ProxyHost && OpenLayers.String.startsWith(url, "http")) {
+        // check for local proxyHost setting, then OpenLayers.ProxyHost
+        if (this.proxyHost && OpenLayers.String.startsWith(url, "http")) {
+            url = this.proxyHost + encodeURIComponent(url);
+        } else if (OpenLayers.ProxyHost &&
+                   OpenLayers.String.startsWith(url, "http")) {
             url = OpenLayers.ProxyHost + encodeURIComponent(url);
         }