[OpenLayers-Commits] r12240 - in trunk/openlayers/lib/OpenLayers: Layer Tile

[commits-20090109 at openlayers.org]

Author: ahocevar
Date: 2011-08-12 14:17:22 -0700 (Fri, 12 Aug 2011)
New Revision: 12240

Modified:
   trunk/openlayers/lib/OpenLayers/Layer/Markers.js
   trunk/openlayers/lib/OpenLayers/Tile/Image.js
Log:
opacity fixes required after reverting r12185. r=mosesonline (closes #3441)

Modified: trunk/openlayers/lib/OpenLayers/Layer/Markers.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Layer/Markers.js	2011-08-12 20:05:25 UTC (rev 12239)
+++ trunk/openlayers/lib/OpenLayers/Layer/Markers.js	2011-08-12 21:17:22 UTC (rev 12240)
@@ -104,7 +104,7 @@
     addMarker: function(marker) {
         this.markers.push(marker);
 
-        if (this.opacity != null) {
+        if (this.opacity < 1) {
             marker.setOpacity(this.opacity);
         }
 

Modified: trunk/openlayers/lib/OpenLayers/Tile/Image.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Tile/Image.js	2011-08-12 20:05:25 UTC (rev 12239)
+++ trunk/openlayers/lib/OpenLayers/Tile/Image.js	2011-08-12 21:17:22 UTC (rev 12240)
@@ -391,7 +391,7 @@
             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,