OpenLayers OpenLayers

Changeset 7666

Show
Ignore:
Timestamp:
08/01/08 14:21:56 (4 months ago)
Author:
crschmidt
Message:

Non unique HTMLElement in Control, fix put together by sbenthall.
Tests pass, etc. (Closes #1396)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r7627 r7666  
    277277                // create input element 
    278278                var inputElem = document.createElement("input"); 
    279                 inputElem.id = "input_" + layer.name; 
     279                inputElem.id = this.id + "_input_" + layer.name; 
    280280                inputElem.name = (baseLayer) ? "baseLayers" : layer.name; 
    281281                inputElem.type = (baseLayer) ? "radio" : "checkbox"; 
    …… 
    491491        // layers list div         
    492492        this.layersDiv = document.createElement("div"); 
    493         this.layersDiv.id = "layersDiv"; 
     493        this.layersDiv.id = this.id + "_layersDiv"; 
    494494        this.layersDiv.style.paddingTop = "5px"; 
    495495        this.layersDiv.style.paddingLeft = "10px"; 

  • trunk/openlayers/lib/OpenLayers/Control/PanZoom.js

    r6833 r7666  
    112112        var imgLocation = OpenLayers.Util.getImagesLocation() + img; 
    113113        var btn = OpenLayers.Util.createAlphaImageDiv( 
    114                                     "OpenLayers_Control_PanZoom_" + id,  
     114                                    this.id + "_" + id,  
    115115                                    xy, sz, imgLocation, "absolute"); 
    116116 

  • trunk/openlayers/lib/OpenLayers/Control/PanZoomBar.js

    r7615 r7666  
    157157        var imgLocation = OpenLayers.Util.getImagesLocation(); 
    158158         
    159         var id = "OpenLayers_Control_PanZoomBar_Slider" + this.map.id; 
     159        var id = this.id + "_" + this.map.id; 
    160160        var zoomsToEnd = this.map.getNumZoomLevels() - 1 - this.map.getZoom(); 
    161161        var slider = OpenLayers.Util.createAlphaImageDiv(id, 
    …… 
    182182         
    183183        if (OpenLayers.Util.alphaHack()) { 
    184             var id = "OpenLayers_Control_PanZoomBar" + this.map.id; 
     184            var id = this.id + "_" + this.map.id; 
    185185            div = OpenLayers.Util.createAlphaImageDiv(id, centered, 
    186186                                      new OpenLayers.Size(sz.w,  

  • trunk/openlayers/tests/Control/LayerSwitcher.html

    r6724 r7666  
    8080        map.addControl(control); 
    8181 
    82          
    83         var wmsInput = OpenLayers.Util.getElement("input_" + layer.name); 
     82        var wmsInput = OpenLayers.Util.getElement(control.id + "_input_" + layer.name); 
    8483        t.ok(wmsInput != null, "correctly makes an input for wms layer"); 
    8584        t.eq(wmsInput.type, "radio", "wms correctly made a radio button"); 
    …… 
    8786        t.eq(wmsInput.value, layer.name, "wms correctly valued"); 
    8887         
    89         var markersInput = OpenLayers.Util.getElement("input_" + markers.name); 
     88        var markersInput = OpenLayers.Util.getElement(control.id + "_input_" + markers.name); 
    9089        t.ok(markersInput != null, "correctly makes an input for markers layer"); 
    9190        t.eq(markersInput.type, "checkbox", "wms correctly made a radio button");