Changeset 1086

Timestamp:

06/16/09 17:19:10 (3 years ago)

Author:

ahocevar

Message:

clean up after ourselves properly, which we did not do enough and not right before. onDestroy() is not available everywhere in Ext, we have to override destroy(). r=tschaub (closes #90)

Files:

• core/trunk/geoext/lib/GeoExt/widgets/tree/LayerContainer.js (modified) (2 diffs)
• core/trunk/geoext/lib/GeoExt/widgets/tree/LayerNode.js (modified) (4 diffs)
• core/trunk/geoext/tests/lib/GeoExt/widgets/tree/LayerContainer.html (modified) (2 diffs)

core/trunk/geoext/lib/GeoExt/widgets/tree/LayerContainer.js

@@ -101 +101 @@
-    },
-
-    /** private: method[onDestroy]
-     */
-    onDestroy: function() {
-        if(this.layerStore) {
-            this.layerStore.un("add", this.onStoreAdd, this);
-            this.layerStore.un("remove", this.onStoreRemove, this);
-        }
-        GeoExt.tree.LayerContainer.superclass.onDestroy.apply(this, arguments);
-    },
-    
-    /** private: method[recordIndexToNodeIndex]
-     *  :param index: ``Number`` The record index in the layer store.
@@ -221 +211 @@
-            delete this._reordering;
-        }
+    },
+
+    /** private: method[destroy]
+     */
+    destroy: function() {
+        if(this.layerStore) {
+            this.layerStore.un("add", this.onStoreAdd, this);
+            this.layerStore.un("remove", this.onStoreRemove, this);
+        }
+        GeoExt.tree.LayerContainer.superclass.destroy.apply(this, arguments);
-    }
-    
-});
-

core/trunk/geoext/lib/GeoExt/widgets/tree/LayerNode.js

@@ -65 +65 @@
-    },
-    
-onD
-
-onD
+d
+
+d
-        delete this.radio;
-onD
+d
-    }
-});
@@ -226 +226 @@
-     */
-    addVisibilityEventHandlers: function() {
-
-
-
-
-
-
+
+
+
+
-        this.on({
-
-
-
-
-
-
+
-            scope: this
-        });
+    },
+    
+    /** private: method[onLayerVisiilityChanged
+     *  handler for visibilitychanged events on the layer
+     */
+    onLayerVisibilityChanged: function() {
+        if(!this.visibilityChanging &&
+                this.attributes.checked != this.layer.getVisibility()) {
+            this.getUI().toggleCheck(this.layer.getVisibility());
+        }
+    },
+    
+    /** private: method[onCheckChange]
+     *  :param node: ``GeoExt.tree.LayerNode``
+     *  :param checked: ``Boolean``
+     *  handler for checkchange events 
+     */
+    onCheckChange: function(node, checked) {
+        if (checked && this.layer.isBaseLayer && this.layer.map) {
+            this.layer.map.setBaseLayer(this.layer);
+        }
+        this.layer.setVisibility(checked);
-    },
-    
@@ -249 +264 @@
-    addStoreEventHandlers: function() {
-        this.layerStore.on({
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-            scope: this
-        });
+    },
+    
+    /** private: method[onStoreAdd]
+     *  :param store: ``Ext.data.Store``
+     *  :param records: ``Array(Ext.data.Record)``
+     *  :param index: ``Nmber``
+     *  handler for add events on the store 
+     */
+    onStoreAdd: function(store, records, index) {
+        var l;
+        for(var i=0; i<records.length; ++i) {
+            l = records[i].get("layer");
+            if(this.layer == l) {
+                this.getUI().show();
+            } else if (this.layer == l.name) {
+                // layer is a string, which means the node has not yet
+                // been rendered because the layer was not found. But
+                // now we have the layer and can render.
+                this.render(bulkRender);
+                return;
+            }
+        }
+    },
+    
+    /** private: method[onStoreRemove]
+     *  :param store: ``Ext.data.Store``
+     *  :param record: ``Ext.data.Record``
+     *  :param index: ``Nmber``
+     *  handler for remove events on the store 
+     */
+    onStoreRemove: function(store, record, index) {
+        if(this.layer == record.get("layer")) {
+            this.getUI().hide();
+        }
-    },
-    
@@ -283 +314 @@
-            this.childNodeType.add(this);
-        }
+    },
+    
+    /** private: method[destroy]
+     */
+    destroy: function() {
+        this.layer.events.un({
+            "visibilitychanged": this.onLayerVisibilityChanged,
+            scope: this
+        });
+        delete this.layer;
+        this.layerStore.un("add", this.onStoreAdd, this);
+        this.layerStore.un("remove", this.onStoreRemove, this);
+        delete this.layerStore;
+        this.un("checkchange", this.onCheckChange, this);
+
+        GeoExt.tree.LayerNode.superclass.destroy.call(this);
-    }
-});

core/trunk/geoext/tests/lib/GeoExt/widgets/tree/LayerContainer.html

@@ -55 +55 @@
-
-            node.destroy();
-//
+
-            
-        }
@@ -118 +118 @@
-            
-            root.destroy();
-//
+
-            
-        }