Changeset 7381

Timestamp:

06/19/08 14:44:25 (2 months ago)

Author:

crschmidt

Message:

break out post-rendering into seperate function to be defined in page. This
removes the tie between the LayerSwitcher and Ext that I had in my first
commit.

Files:

• trunk/openlayers/examples/controls.html (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Control/LayerSwitcher.js (modified) (5 diffs)

trunk/openlayers/examples/controls.html

@@ -5 +5 @@
-        <link rel="stylesheet" href="../theme/default/style.css" type="text/css" />
-        <link rel="stylesheet" href="style.css" type="text/css" />
+    <link rel="stylesheet" type="text/css" href="http://www.extjs.com/deploy/dev//resources/css/ext-all.css">
+
+    <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"> </script><script type="text/javascript">_uacct = "UA-1396058-1";urchinTracker();</script>
+    <link rel="stylesheet" type="text/css" href="http://www.extjs.com/deploy/dev//resources/css/xtheme-default.css" /><!-- LIBS -->
+    <script type="text/javascript" src="http://www.extjs.com/deploy/dev//adapter/ext/ext-base.js"></script>
+    <!-- ENDLIBS -->
+
+    <script type="text/javascript" src="http://www.extjs.com/deploy/dev//ext-all.js"></script>
+
+    <!-- Common Styles for the examples -->
+    <link rel="stylesheet" type="text/css" href="../shared/examples.css">
-        <script src="../lib/OpenLayers.js"></script>
-        <script type="text/javascript">
-            var map;
+            function layerRenderAdditional(layerDiv, layer) {
+                var sliderDiv = document.createElement("div");
+                sliderDiv.className = "olControlLayerSwitcherLayerDivSlider";
+                layerDiv.appendChild(sliderDiv);    
+                sliderDiv.style.height="20px";
+                var sliderValue = layer.opacity == null ? 100 : layer.opacity * 100;
+                var slider = new Ext.Slider({renderTo: sliderDiv, width: 100, minValue: 0, maxValue: 100, animate: false});
+                slider.on("change", function(slider, newValue) {
+                    this.layer.setOpacity(newValue/100);
+                }, {layer: layer, control: this}); 
+                slider.on("dragstart", function(slider, e) { 
+                    this.control.isMouseDown = false; 
+                }, {control: this});  
+                if (this.maximizeDiv.style.display != "none") { 
+                    this.maximizeControl();
+                    slider.setValue(sliderValue);
+                    this.minimizeControl();
+                } else {
+                    slider.setValue(sliderValue);
+                }
+            }
-            function init(){
-                map = new OpenLayers.Map('map', {
@@ -13 +45 @@
-                        new OpenLayers.Control.PanZoomBar(),
-                        new OpenLayers.Control.MouseToolbar(),
-
+, layerRenderAdditional: layerRenderAdditional
-                        new OpenLayers.Control.Permalink(),
-                        new OpenLayers.Control.ScaleLine(),

trunk/openlayers/lib/OpenLayers/Control/LayerSwitcher.js

@@ -255 +255 @@
-        }    
-
+        this.layerDivList = [];     
-        var layers = this.map.layers.slice();
-        if (!this.ascending) { layers.reverse(); }
@@ -274 +275 @@
-                                          : layer.getVisibility();
-    
+                var layerDiv = document.createElement("div"); 
+                layerDiv.id = this.id+"_layerDiv_"+layer.id;
+                layerDiv.className = "olControlLayerSwitcherLayerDiv";
+
-                // create input element
-                var inputElem = document.createElement("input");
@@ -308 +313 @@
-                                                            context)
-                );
-                // create line break
-                var br = document.createElement("br");
-    
-                
-                var groupArray = (baseLayer) ? this.baseLayers
@@ -320 +322 @@
-                });
-                                                     
-
+     
-                var groupDiv = (baseLayer) ? this.baseLayersDiv
-                                           : this.dataLayersDiv;
-
-
-
+
+
+
+
+
+
+
-            }
-        }
@@ -335 +341 @@
-        this.baseLbl.style.display = (containsBaseLayers) ? "" : "none";        
-
+        
-        return this.div;
-    },
-
+
+
+
+
-    /** 
-     * Method: