[Commits] r1247 - in core/trunk/geoext: lib/GeoExt/widgets/tree tests/lib/GeoExt/widgets/tree

[commits at geoext.org]

Author: tschaub
Date: 2009-07-11 00:07:21 +0200 (Sat, 11 Jul 2009)
New Revision: 1247

Modified:
   core/trunk/geoext/lib/GeoExt/widgets/tree/BaseLayerContainer.js
   core/trunk/geoext/lib/GeoExt/widgets/tree/OverlayLayerContainer.js
   core/trunk/geoext/tests/lib/GeoExt/widgets/tree/BaseLayerContainer.html
Log:
Passing all the args to the super in OverlayLayerContainer and BaseLayerContainer.  r=ahocevar (closes #111)

Modified: core/trunk/geoext/lib/GeoExt/widgets/tree/BaseLayerContainer.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/widgets/tree/BaseLayerContainer.js	2009-07-10 12:37:25 UTC (rev 1246)
+++ core/trunk/geoext/lib/GeoExt/widgets/tree/BaseLayerContainer.js	2009-07-10 22:07:21 UTC (rev 1247)
@@ -48,16 +48,18 @@
     },
 
     /** private: method[addLayerNode]
-     *  :param layerRecord: ``Ext.data.Record`` the layer record to add a node
-     *      for
-     * 
-     *  Adds a child node representing a base layer of the map.
+     *  :param layerRecord: ``Ext.data.Record`` The layer record containing the
+     *      layer to be added.
+     *  :param index: ``Number`` Optional index for the new layer.  Default is 0.
+     *  
+     *  Adds a child node representing a base layer of the map
      */
-    addLayerNode: function(layerRecord) {
+    addLayerNode: function(layerRecord, index) {
         var layer = layerRecord.get("layer");
         if (layer.isBaseLayer == true) {
-            GeoExt.tree.BaseLayerContainer.superclass.addLayerNode.call(this,
-                layerRecord);
+            GeoExt.tree.BaseLayerContainer.superclass.addLayerNode.apply(
+                this, arguments
+            );
         }
     },
     
@@ -70,8 +72,9 @@
     removeLayerNode: function(layerRecord) {
         var layer = layerRecord.get("layer");
         if (layer.isBaseLayer == true) {
-            GeoExt.tree.BaseLayerContainer.superclass.removeLayerNode.call(this,
-                layerRecord);
+            GeoExt.tree.BaseLayerContainer.superclass.removeLayerNode.apply(
+                this, arguments
+            );
     	}
     }
 });

Modified: core/trunk/geoext/lib/GeoExt/widgets/tree/OverlayLayerContainer.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/widgets/tree/OverlayLayerContainer.js	2009-07-10 12:37:25 UTC (rev 1246)
+++ core/trunk/geoext/lib/GeoExt/widgets/tree/OverlayLayerContainer.js	2009-07-10 22:07:21 UTC (rev 1247)
@@ -42,16 +42,18 @@
     },
 
     /** private: method[addLayerNode]
-     *  :param layerRecord:  ``Ext.data.Record`` the layer record to add a node
-     *      for
+     *  :param layerRecord: ``Ext.data.Record`` The layer record containing the
+     *      layer to be added.
+     *  :param index: ``Number`` Optional index for the new layer.  Default is 0.
      *  
      *  Adds a child node representing a overlay layer of the map.
      */
-    addLayerNode: function(layerRecord) {
+    addLayerNode: function(layerRecord, index) {
         var layer = layerRecord.get("layer");
         if (layer.isBaseLayer == false) {
-            GeoExt.tree.OverlayLayerContainer.superclass.addLayerNode.call(this,
-                layerRecord);
+            GeoExt.tree.OverlayLayerContainer.superclass.addLayerNode.apply(
+                this, arguments
+            );
         }
     },
     
@@ -64,8 +66,9 @@
     removeLayerNode: function(layerRecord) {
         var layer = layerRecord.get("layer");
         if (layer.isBaseLayer == false) {
-            GeoExt.tree.OverlayLayerContainer.superclass.removeLayerNode.call(
-                this, layerRecord);
+            GeoExt.tree.OverlayLayerContainer.superclass.removeLayerNode.apply(
+                this, arguments
+            );
     	}
     }
 });

Modified: core/trunk/geoext/tests/lib/GeoExt/widgets/tree/BaseLayerContainer.html
===================================================================
--- core/trunk/geoext/tests/lib/GeoExt/widgets/tree/BaseLayerContainer.html	2009-07-10 12:37:25 UTC (rev 1246)
+++ core/trunk/geoext/tests/lib/GeoExt/widgets/tree/BaseLayerContainer.html	2009-07-10 22:07:21 UTC (rev 1247)
@@ -41,6 +41,32 @@
             
         }
         
+        function test_addLayerNode(t) {
+            
+            t.plan(2);
+            
+            // setup
+            var original = GeoExt.tree.LayerContainer.prototype.addLayerNode;
+            var container = new GeoExt.tree.BaseLayerContainer({});
+            var args;
+            GeoExt.tree.LayerContainer.prototype.addLayerNode = function() {
+                args = arguments;
+            };
+            var Rec = Ext.data.Record.create([{name: "layer"}]);
+            var record = new Rec({
+                layer: new OpenLayers.Layer(null, {isBaseLayer: true})
+            });
+            
+            // call addLayerNode with two args and confirm the super got both
+            container.addLayerNode(record, 4);
+            t.eq(args.length, 2, "method called with two arguments");
+            t.eq(args[1], 4, "method called with correct second argument");
+            
+            // clean up
+            GeoExt.tree.LayerContainer.prototype.addLayerNode = original;
+            
+        }
+        
         </script>
     </head>
     <body>