From 01154beb5dd1176244f7f00a183a9c0b1074ba60 Mon Sep 17 00:00:00 2001 From: crschmidt Date: Sun, 30 Sep 2007 16:41:42 +0000 Subject: [PATCH] from fredj: "in lib/OpenLayers/Layer.js and lib/OpenLayers/Control.js the div id is not passed to the createDiv() function." (Closes #1015) git-svn-id: http://svn.openlayers.org/trunk/openlayers@4677 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf --- lib/OpenLayers/Control.js | 3 +-- lib/OpenLayers/Layer.js | 7 +++---- tests/test_Layer.html | 5 ++++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/OpenLayers/Control.js b/lib/OpenLayers/Control.js index dae21ee400..f521718c8b 100644 --- a/lib/OpenLayers/Control.js +++ b/lib/OpenLayers/Control.js @@ -170,8 +170,7 @@ OpenLayers.Control = OpenLayers.Class({ */ draw: function (px) { if (this.div == null) { - this.div = OpenLayers.Util.createDiv(); - this.div.id = this.id; + this.div = OpenLayers.Util.createDiv(this.id); this.div.className = this.displayClass; } if (px != null) { diff --git a/lib/OpenLayers/Layer.js b/lib/OpenLayers/Layer.js index 0c8e02f59f..9ec06d611f 100644 --- a/lib/OpenLayers/Layer.js +++ b/lib/OpenLayers/Layer.js @@ -32,10 +32,10 @@ OpenLayers.Layer = OpenLayers.Class({ * Constant: EVENT_TYPES * {Array(String)} Supported application event types */ - EVENT_TYPES: [ "loadstart", "loadend", "loadcancel", "visibilitychanged"], + EVENT_TYPES: ["loadstart", "loadend", "loadcancel", "visibilitychanged"], /** - * APIProperty: events`` + * APIProperty: events * {} */ events: null, @@ -238,10 +238,9 @@ OpenLayers.Layer = OpenLayers.Class({ this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_"); - this.div = OpenLayers.Util.createDiv(); + this.div = OpenLayers.Util.createDiv(this.id); this.div.style.width = "100%"; this.div.style.height = "100%"; - this.div.id = this.id; this.events = new OpenLayers.Events(this, this.div, this.EVENT_TYPES); diff --git a/tests/test_Layer.html b/tests/test_Layer.html index c143219a2a..c1715ec161 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( 13 ); + t.plan( 15 ); var options = { chicken: 151, foo: "bar", projection: "none" }; var layer = new OpenLayers.Layer('Test Layer', options); @@ -19,6 +19,9 @@ 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" ); + t.ok( typeof layer.div == "object" , "layer.div is created" ); + t.eq( layer.div.id, layer.id, "layer.div.id is correct" ); + options.chicken = 552; t.eq( layer.options["chicken"], 151 , "layer.options correctly made fresh copy" );