From a57c56ed967cb62cc34927392a93ce12d0b53f8e Mon Sep 17 00:00:00 2001 From: ahocevar Date: Mon, 23 Apr 2012 18:03:39 -0400 Subject: [PATCH] Revert "Merge pull request #432 from ahocevar/iframe-opacity" This reverts commit af046b9af80ec3467a431f9d3dc0fbf606a2769a, reversing changes made to f36fd5f0d18d45e2654f0ffe48598d94b63c7526. The reason for reverting this is that the change breaks the select-feature-multilayer.html example. --- lib/OpenLayers/Layer.js | 7 +------ lib/OpenLayers/Renderer/SVG.js | 2 +- lib/deprecated.js | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/OpenLayers/Layer.js b/lib/OpenLayers/Layer.js index e29e95b43f..63f0aaab2a 100644 --- a/lib/OpenLayers/Layer.js +++ b/lib/OpenLayers/Layer.js @@ -1286,12 +1286,7 @@ OpenLayers.Layer = OpenLayers.Class({ this.opacity = opacity; var childNodes = this.div.childNodes; for(var i = 0, len = childNodes.length; i < len; ++i) { - var element = childNodes[i].lastChild || childNodes[i]; - if (element.nodeName.toLowerCase() === "iframe") { - // changing opacity on IFrame elements does not work, so - // we set it on the parent - element = element.parentNode; - } + var element = childNodes[i].firstChild || childNodes[i]; OpenLayers.Util.modifyDOMElement(element, null, null, null, null, null, null, opacity); } diff --git a/lib/OpenLayers/Renderer/SVG.js b/lib/OpenLayers/Renderer/SVG.js index 91b5b9e3e5..e65da76a9a 100644 --- a/lib/OpenLayers/Renderer/SVG.js +++ b/lib/OpenLayers/Renderer/SVG.js @@ -470,7 +470,7 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, { */ createDefs: function() { var defs = this.nodeFactory(this.container.id + "_defs", "defs"); - this.rendererRoot.insertBefore(defs, this.root); + this.rendererRoot.appendChild(defs); return defs; }, diff --git a/lib/deprecated.js b/lib/deprecated.js index face85c114..0cc3c1b6aa 100644 --- a/lib/deprecated.js +++ b/lib/deprecated.js @@ -5256,7 +5256,7 @@ OpenLayers.Renderer.SVG2 = OpenLayers.Class(OpenLayers.Renderer.NG, { */ createDefs: function() { var defs = this.nodeFactory(this.container.id + "_defs", "defs"); - this.rendererRoot.insertBefore(defs, this.root); + this.rendererRoot.appendChild(defs); return defs; },