From a8d3d6a5b4aba260e23cc1819d1d8ec9ffedcd15 Mon Sep 17 00:00:00 2001 From: ahocevar Date: Fri, 12 Aug 2011 21:17:22 +0000 Subject: [PATCH] opacity fixes required after reverting r12185. r=mosesonline (closes #3441) git-svn-id: http://svn.openlayers.org/trunk/openlayers@12240 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf --- lib/OpenLayers/Layer/Markers.js | 2 +- lib/OpenLayers/Tile/Image.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/OpenLayers/Layer/Markers.js b/lib/OpenLayers/Layer/Markers.js index 09a262a348..de7917f78e 100644 --- a/lib/OpenLayers/Layer/Markers.js +++ b/lib/OpenLayers/Layer/Markers.js @@ -104,7 +104,7 @@ OpenLayers.Layer.Markers = OpenLayers.Class(OpenLayers.Layer, { addMarker: function(marker) { this.markers.push(marker); - if (this.opacity != null) { + if (this.opacity < 1) { marker.setOpacity(this.opacity); } diff --git a/lib/OpenLayers/Tile/Image.js b/lib/OpenLayers/Tile/Image.js index 0351c08594..b195ac0ab3 100644 --- a/lib/OpenLayers/Tile/Image.js +++ b/lib/OpenLayers/Tile/Image.js @@ -391,7 +391,7 @@ OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile, { this.frame.appendChild(this.imgDiv); this.layer.div.appendChild(this.frame); - if(this.layer.opacity != null) { + if(this.layer.opacity < 1) { OpenLayers.Util.modifyDOMElement(this.imgDiv, null, null, null, null, null, null,