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

[commits at geoext.org]

Author: ahocevar
Date: 2009-07-05 03:50:21 +0200 (Sun, 05 Jul 2009)
New Revision: 1228

Modified:
   core/trunk/geoext/lib/GeoExt/widgets/tree/LayerNode.js
   core/trunk/geoext/tests/lib/GeoExt/widgets/tree/LayerNode.html
Log:
Only change the node text to a new layer name if the node's text was 
equal to the layer name before the modification. r=bartvde (closes #110)


Modified: core/trunk/geoext/lib/GeoExt/widgets/tree/LayerNode.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/widgets/tree/LayerNode.js	2009-07-04 12:36:25 UTC (rev 1227)
+++ core/trunk/geoext/lib/GeoExt/widgets/tree/LayerNode.js	2009-07-05 01:50:21 UTC (rev 1228)
@@ -334,8 +334,9 @@
      */
     onStoreUpdate: function(store, record, operation) {
     	var layer = record.get("layer");
-        if(this.layer == layer && this.text !== layer.name) {
-            this.setText(layer.name);
+        if(this.layer == layer && record.isModified("title") &&
+                                    record.modified["title"] == this.text) {
+            this.setText(record.get("title"));
         }
     },
 

Modified: core/trunk/geoext/tests/lib/GeoExt/widgets/tree/LayerNode.html
===================================================================
--- core/trunk/geoext/tests/lib/GeoExt/widgets/tree/LayerNode.html	2009-07-04 12:36:25 UTC (rev 1227)
+++ core/trunk/geoext/tests/lib/GeoExt/widgets/tree/LayerNode.html	2009-07-05 01:50:21 UTC (rev 1228)
@@ -74,7 +74,7 @@
         }
 
         function test_changelayername(t) {
-            t.plan(1);
+            t.plan(2);
 
             var layer = new OpenLayers.Layer("test");
 
@@ -95,6 +95,15 @@
 
             layer.setName("My new name");
             t.eq(node.text, "My new name", "Node is named 'My new name' after layer setName is called");
+            
+            node = new GeoExt.tree.LayerNode({
+                layer: "My new name",
+                layerStore: mapPanel.layers,
+                text: "My custom text"
+            });
+            
+            layer.setName("test");
+            t.eq(node.text, "My custom text", "Node text does not change with layer name if custom text was provided");
 
             node.destroy();
             mapPanel.destroy();