[Commits] r968 - in sandbox/opengeo/geoexplorer: lib/GeoExt/data lib/GeoExt/widgets lib/GeoExt/widgets/tree tests/lib/GeoExt/data tests/lib/GeoExt/widgets/tree

[commits at geoext.org]

Author: tschaub
Date: 2009-06-02 23:40:30 +0200 (Tue, 02 Jun 2009)
New Revision: 968

Modified:
   sandbox/opengeo/geoexplorer/lib/GeoExt/data/LayerStore.js
   sandbox/opengeo/geoexplorer/lib/GeoExt/widgets/MapPanel.js
   sandbox/opengeo/geoexplorer/lib/GeoExt/widgets/tree/LayerContainer.js
   sandbox/opengeo/geoexplorer/tests/lib/GeoExt/data/LayerStore.html
   sandbox/opengeo/geoexplorer/tests/lib/GeoExt/widgets/tree/LayerContainer.html
Log:
Cleaning up merge artifacts.

Modified: sandbox/opengeo/geoexplorer/lib/GeoExt/data/LayerStore.js
===================================================================
--- sandbox/opengeo/geoexplorer/lib/GeoExt/data/LayerStore.js	2009-06-02 21:11:15 UTC (rev 967)
+++ sandbox/opengeo/geoexplorer/lib/GeoExt/data/LayerStore.js	2009-06-02 21:40:30 UTC (rev 968)
@@ -212,16 +212,7 @@
             } else {
                 this.fireEvent("update", this, record, Ext.data.Record.EDIT);
             }
-        } else if (evt.property === "visibility") {
-            var layerIndex = this.map.getLayerIndex(layer);
-            var recordIndex = this.findBy(function(rec, id) {
-                return rec.get("layer") === layer;
-            });
-            if (recordIndex > -1) {
-                var record = this.getAt(recordIndex);
-                this.fireEvent("update", this, record, Ext.data.Record.EDIT);
-            }
-         }
+        }
     },
    
     /** private: method[onAddLayer]

Modified: sandbox/opengeo/geoexplorer/lib/GeoExt/widgets/MapPanel.js
===================================================================
--- sandbox/opengeo/geoexplorer/lib/GeoExt/widgets/MapPanel.js	2009-06-02 21:11:15 UTC (rev 967)
+++ sandbox/opengeo/geoexplorer/lib/GeoExt/widgets/MapPanel.js	2009-06-02 21:40:30 UTC (rev 968)
@@ -161,27 +161,6 @@
         }
     },
     
-    /**
-     * Method: onBeforeAdd
-     * Private method called before a component is added to the panel.
-     */
-    onBeforeAdd: function(item) {
-        if(typeof item.addToMap === "function") {
-            item.addToMap(this);
-        }
-        GeoExt.MapPanel.superclass.onBeforeAdd.apply(this, arguments);
-    },
-    
-    /**
-     * Method: remove
-     */
-    remove: function(item, autoDestroy) {
-        if(typeof item.removeFromMap === "function") {
-            item.removeFromMap(this);
-        }
-        GeoExt.MapPanel.superclass.remove.apply(this, arguments);
-    },
-    
     /** private: method[afterRender]
      *  Private method called after the panel has been rendered.
      */
@@ -250,6 +229,7 @@
         delete this.map;
         GeoExt.MapPanel.superclass.beforeDestroy.apply(this, arguments);
     }
+    
 });
 
 /** api: function[guess]
@@ -266,5 +246,6 @@
     }); 
 };
 
+
 /** api: xtype = gx_mappanel */
 Ext.reg('gx_mappanel', GeoExt.MapPanel); 

Modified: sandbox/opengeo/geoexplorer/lib/GeoExt/widgets/tree/LayerContainer.js
===================================================================
--- sandbox/opengeo/geoexplorer/lib/GeoExt/widgets/tree/LayerContainer.js	2009-06-02 21:11:15 UTC (rev 967)
+++ sandbox/opengeo/geoexplorer/lib/GeoExt/widgets/tree/LayerContainer.js	2009-06-02 21:40:30 UTC (rev 968)
@@ -8,10 +8,6 @@
 /**
  * @include GeoExt/widgets/tree/LayerNode.js
  */
-
-/**
- * @include GeoExt/widgets/tree/LayerNode.js
- */
 Ext.namespace("GeoExt.tree");
 
 /** api: (define)

Modified: sandbox/opengeo/geoexplorer/tests/lib/GeoExt/data/LayerStore.html
===================================================================
--- sandbox/opengeo/geoexplorer/tests/lib/GeoExt/data/LayerStore.html	2009-06-02 21:11:15 UTC (rev 967)
+++ sandbox/opengeo/geoexplorer/tests/lib/GeoExt/data/LayerStore.html	2009-06-02 21:40:30 UTC (rev 968)
@@ -190,7 +190,6 @@
             t.eq(store.getCount(), 1, "store has a single record before adding copy");
             t.eq(map.layers.length, 1, "map has a single layer before adding copy");
             
-
             // create a copy of the record with the same layer
             var copy = record.copy(); // record with same id will replace original
             copy.set("layer", record.get("layer")); // force records to have same layer            

Modified: sandbox/opengeo/geoexplorer/tests/lib/GeoExt/widgets/tree/LayerContainer.html
===================================================================
--- sandbox/opengeo/geoexplorer/tests/lib/GeoExt/widgets/tree/LayerContainer.html	2009-06-02 21:11:15 UTC (rev 967)
+++ sandbox/opengeo/geoexplorer/tests/lib/GeoExt/widgets/tree/LayerContainer.html	2009-06-02 21:40:30 UTC (rev 968)
@@ -62,5 +62,4 @@
     <body>
         <div id="map" style="width: 100px; height: 100px;"></div>
     </body>
-</html>
-
+</html>
\ No newline at end of file