From 74f5b814eb611ec5e6566d149fd74ba55d9a1e16 Mon Sep 17 00:00:00 2001 From: euzuro Date: Wed, 6 Sep 2006 20:44:55 +0000 Subject: [PATCH] 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 --- lib/OpenLayers/Control.js | 7 +++---- lib/OpenLayers/Control/LayerSwitcher.js | 4 ---- lib/OpenLayers/Control/LayerTabs.js | 4 ---- lib/OpenLayers/Control/MouseToolbar.js | 4 ---- lib/OpenLayers/Control/PanZoom.js | 4 ---- lib/OpenLayers/Control/PanZoomBar.js | 4 ---- lib/OpenLayers/Control/Permalink.js | 4 ---- lib/OpenLayers/Control/Scale.js | 4 ---- lib/OpenLayers/Layer.js | 6 +++--- tests/test_Layer.html | 3 +-- 10 files changed, 7 insertions(+), 37 deletions(-) diff --git a/lib/OpenLayers/Control.js b/lib/OpenLayers/Control.js index 612772771c..2df61bf144 100644 --- a/lib/OpenLayers/Control.js +++ b/lib/OpenLayers/Control.js @@ -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(); diff --git a/lib/OpenLayers/Control/LayerSwitcher.js b/lib/OpenLayers/Control/LayerSwitcher.js index fb23d78b8c..89453e90bb 100644 --- a/lib/OpenLayers/Control/LayerSwitcher.js +++ b/lib/OpenLayers/Control/LayerSwitcher.js @@ -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", diff --git a/lib/OpenLayers/Control/LayerTabs.js b/lib/OpenLayers/Control/LayerTabs.js index 619f4c4974..911d91876c 100644 --- a/lib/OpenLayers/Control/LayerTabs.js +++ b/lib/OpenLayers/Control/LayerTabs.js @@ -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: "", diff --git a/lib/OpenLayers/Control/MouseToolbar.js b/lib/OpenLayers/Control/MouseToolbar.js index cf612bc3f0..99158913be 100644 --- a/lib/OpenLayers/Control/MouseToolbar.js +++ b/lib/OpenLayers/Control/MouseToolbar.js @@ -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, diff --git a/lib/OpenLayers/Control/PanZoom.js b/lib/OpenLayers/Control/PanZoom.js index 538c255cc8..518c836c31 100644 --- a/lib/OpenLayers/Control/PanZoom.js +++ b/lib/OpenLayers/Control/PanZoom.js @@ -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, diff --git a/lib/OpenLayers/Control/PanZoomBar.js b/lib/OpenLayers/Control/PanZoomBar.js index d692741f00..448c9b9c10 100644 --- a/lib/OpenLayers/Control/PanZoomBar.js +++ b/lib/OpenLayers/Control/PanZoomBar.js @@ -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, diff --git a/lib/OpenLayers/Control/Permalink.js b/lib/OpenLayers/Control/Permalink.js index e5b1df712b..0c7feb1202 100644 --- a/lib/OpenLayers/Control/Permalink.js +++ b/lib/OpenLayers/Control/Permalink.js @@ -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, diff --git a/lib/OpenLayers/Control/Scale.js b/lib/OpenLayers/Control/Scale.js index 6c5a39bad5..95bc2ee745 100644 --- a/lib/OpenLayers/Control/Scale.js +++ b/lib/OpenLayers/Control/Scale.js @@ -13,10 +13,6 @@ OpenLayers.Control.Scale.prototype = /** @type DOMElement */ element: null, - /** For div.id - * @type String */ - id: "Scale", - /** * @constructor * diff --git a/lib/OpenLayers/Layer.js b/lib/OpenLayers/Layer.js index b12fa52488..8cea0f342e 100644 --- a/lib/OpenLayers/Layer.js +++ b/lib/OpenLayers/Layer.js @@ -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; } } }, diff --git a/tests/test_Layer.html b/tests/test_Layer.html index addbbf440d..ba22a6a73f 100644 --- a/tests/test_Layer.html +++ b/tests/test_Layer.html @@ -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" );