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

Thu Apr 29 10:11:30 CEST 2010

Author: bartvde
Date: 2010-04-29 10:11:30 +0200 (Thu, 29 Apr 2010)
New Revision: 2140

Modified:
   sandbox/bartvde/playground/geoext/examples/wms-tree.html
   sandbox/bartvde/playground/geoext/lib/GeoExt/widgets/tree/WMSLoader.js
Log:
make sure it works with Ext 2 as well as Ext 3

Modified: sandbox/bartvde/playground/geoext/examples/wms-tree.html
===================================================================

--- sandbox/bartvde/playground/geoext/examples/wms-tree.html	2010-04-29 07:54:17 UTC (rev 2139)
+++ sandbox/bartvde/playground/geoext/examples/wms-tree.html	2010-04-29 08:11:30 UTC (rev 2140)
@@ -2,16 +2,11 @@
     <head>
         <title>WMSLoader Example</title>
 
-<!--        <script type="text/javascript" src="http://extjs.cachefly.net/ext-2.2.1/adapter/ext/ext-base.js"></script>
+        <script type="text/javascript" src="http://extjs.cachefly.net/ext-2.2.1/adapter/ext/ext-base.js"></script>
         <script type="text/javascript" src="http://extjs.cachefly.net/ext-2.2.1/ext-all.js"></script>
         <link rel="stylesheet" type="text/css" href="http://extjs.cachefly.net/ext-2.2.1/resources/css/ext-all.css" />
-        <link rel="stylesheet" type="text/css" href="http://extjs.cachefly.net/ext-2.2.1/examples/shared/examples.css" />-->
+        <link rel="stylesheet" type="text/css" href="http://extjs.cachefly.net/ext-2.2.1/examples/shared/examples.css" />
 
-        <script type="text/javascript" src="http://extjs.cachefly.net/ext-3.2.0/adapter/ext/ext-base.js"></script>
-        <script type="text/javascript" src="http://extjs.cachefly.net/ext-3.2.0/ext-all.js"></script>
-        <link rel="stylesheet" type="text/css" href="http://extjs.cachefly.net/ext-3.2.0/resources/css/ext-all.css" />
-        <link rel="stylesheet" type="text/css" href="http://extjs.cachefly.net/ext-3.2.0/examples/shared/examples.css" />
-
         <script src="http://www.openlayers.org/api/2.9/OpenLayers.js"></script>
         <script type="text/javascript" src="../lib/GeoExt.js"></script>
         <script type="text/javascript" src="../lib/overrides/override-ext-ajax.js"></script>

Modified: sandbox/bartvde/playground/geoext/lib/GeoExt/widgets/tree/WMSLoader.js
===================================================================
--- sandbox/bartvde/playground/geoext/lib/GeoExt/widgets/tree/WMSLoader.js	2010-04-29 07:54:17 UTC (rev 2139)
+++ sandbox/bartvde/playground/geoext/lib/GeoExt/widgets/tree/WMSLoader.js	2010-04-29 08:11:30 UTC (rev 2140)
@@ -51,7 +51,9 @@
             response.responseXML || response.responseText);
         this.processLayer(capabilities.capability,
             capabilities.capability.request.getmap.href, node);
-        this.runCallback(callback, scope || node, [node]);
+        if (typeof callback == "function") {
+            callback.apply(scope || node, [node]);
+        }
     },
 
     /** private: method[createWMSLayer]

