update id system -- now control and layer divs take their classname and add a random number
git-svn-id: http://svn.openlayers.org/trunk/openlayers@1411 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -31,6 +31,8 @@ OpenLayers.Control.prototype = {
|
||||
*/
|
||||
initialize: function (options) {
|
||||
Object.extend(this, options);
|
||||
|
||||
this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
|
||||
},
|
||||
|
||||
/**
|
||||
@@ -60,10 +62,7 @@ OpenLayers.Control.prototype = {
|
||||
draw: function (px) {
|
||||
if (this.div == null) {
|
||||
this.div = OpenLayers.Util.createDiv();
|
||||
this.div.id = "Control";
|
||||
if (this.id != null) {
|
||||
this.div.id += "_" + this.id;
|
||||
}
|
||||
this.div.id = this.id;
|
||||
}
|
||||
if (px != null) {
|
||||
this.position = px.clone();
|
||||
|
||||
@@ -11,10 +11,6 @@ OpenLayers.Control.LayerSwitcher = Class.create();
|
||||
OpenLayers.Control.LayerSwitcher.prototype =
|
||||
Object.extend( new OpenLayers.Control(), {
|
||||
|
||||
/** For div.id
|
||||
* @type String */
|
||||
id: "LayerSwitcher",
|
||||
|
||||
/** @type String */
|
||||
activeColor: "darkblue",
|
||||
|
||||
|
||||
@@ -27,10 +27,6 @@ OpenLayers.Control.LayerTabs.NONACTIVE_COLOR = "lightblue";
|
||||
OpenLayers.Control.LayerTabs.prototype =
|
||||
Object.extend( new OpenLayers.Control(), {
|
||||
|
||||
/** For div.id
|
||||
* @type String */
|
||||
id: "LayerTabs",
|
||||
|
||||
/** @type String */
|
||||
activeColor: "",
|
||||
|
||||
|
||||
@@ -15,10 +15,6 @@ OpenLayers.Control.MouseToolbar.prototype =
|
||||
Object.extend( new OpenLayers.Control(),
|
||||
Object.extend( new OpenLayers.Control.MouseDefaults(), {
|
||||
|
||||
/** For div.id
|
||||
* @type String */
|
||||
id: "MouseToolbar",
|
||||
|
||||
mode: null,
|
||||
|
||||
buttons: null,
|
||||
|
||||
@@ -13,10 +13,6 @@ OpenLayers.Control.PanZoom.Y = 4;
|
||||
OpenLayers.Control.PanZoom.prototype =
|
||||
Object.extend( new OpenLayers.Control(), {
|
||||
|
||||
/** For div.id
|
||||
* @type String */
|
||||
id: "PanZoom",
|
||||
|
||||
/** @type int */
|
||||
slideFactor: 50,
|
||||
|
||||
|
||||
@@ -13,10 +13,6 @@ OpenLayers.Control.PanZoomBar.Y = 4;
|
||||
OpenLayers.Control.PanZoomBar.prototype =
|
||||
Object.extend( new OpenLayers.Control.PanZoom(), {
|
||||
|
||||
/** For div.id
|
||||
* @type String */
|
||||
id: "PanZoomBar",
|
||||
|
||||
/** @type Array(...) */
|
||||
buttons: null,
|
||||
|
||||
|
||||
@@ -11,10 +11,6 @@ OpenLayers.Control.Permalink = Class.create();
|
||||
OpenLayers.Control.Permalink.prototype =
|
||||
Object.extend( new OpenLayers.Control(), {
|
||||
|
||||
/** For div.id
|
||||
* @type String */
|
||||
id: "Permalink",
|
||||
|
||||
/** @type DOMElement */
|
||||
element: null,
|
||||
|
||||
|
||||
@@ -13,10 +13,6 @@ OpenLayers.Control.Scale.prototype =
|
||||
/** @type DOMElement */
|
||||
element: null,
|
||||
|
||||
/** For div.id
|
||||
* @type String */
|
||||
id: "Scale",
|
||||
|
||||
/**
|
||||
* @constructor
|
||||
*
|
||||
|
||||
@@ -92,13 +92,13 @@ OpenLayers.Layer.prototype = {
|
||||
|
||||
this.name = name;
|
||||
|
||||
//generate unique id based on name
|
||||
this.id = OpenLayers.Util.createUniqueID("Layer_");
|
||||
|
||||
this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
|
||||
|
||||
if (this.div == null) {
|
||||
this.div = OpenLayers.Util.createDiv();
|
||||
this.div.style.width = "100%";
|
||||
this.div.style.height = "100%";
|
||||
this.div.id = this.id;
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
var layer;
|
||||
|
||||
function test_01_Layer_constructor (t) {
|
||||
t.plan( 14 );
|
||||
t.plan( 13 );
|
||||
|
||||
var options = { chicken: 151, foo: "bar", projection: "none" };
|
||||
var layer = new OpenLayers.Layer('Test Layer', options);
|
||||
@@ -15,7 +15,6 @@
|
||||
|
||||
t.eq( layer.name, "Test Layer", "layer.name is correct" );
|
||||
t.ok( layer.id != null, "Layer is given an id");
|
||||
t.ok( layer.id.startsWith("Layer_"), "layer id starts correctly");
|
||||
t.ok( layer.projection, "none", "default layer projection correctly set");
|
||||
t.ok( ((layer.chicken == 151) && (layer.foo == "bar")), "layer.options correctly set to Layer Object" );
|
||||
t.ok( ((layer.options["chicken"] == 151) && (layer.options["foo"] == "bar")), "layer.options correctly backed up" );
|
||||
|
||||
Reference in New Issue
Block a user