[OpenLayers-Commits] r12244 - in trunk/openlayers/lib/OpenLayers/Tile: . Image

[commits-20090109 at openlayers.org]

Author: ahocevar
Date: 2011-08-13 02:17:24 -0700 (Sat, 13 Aug 2011)
New Revision: 12244

Modified:
   trunk/openlayers/lib/OpenLayers/Tile/Image.js
   trunk/openlayers/lib/OpenLayers/Tile/Image/IFrame.js
Log:
reverting r12243, because it breaks the loadend event (see #3419)

Modified: trunk/openlayers/lib/OpenLayers/Tile/Image/IFrame.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Tile/Image/IFrame.js	2011-08-13 08:15:36 UTC (rev 12243)
+++ trunk/openlayers/lib/OpenLayers/Tile/Image/IFrame.js	2011-08-13 09:17:24 UTC (rev 12244)
@@ -28,7 +28,15 @@
      */ 
     useIFrame: null,
 
-   /**
+    /**
+     * Property: blankImageUrl
+     * {String} This is only used as background image for the eventPane, so we
+     * don't care that this doesn't actually result in a blank image on all
+     * browsers
+     */
+    blankImageUrl: "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAQAIBRAA7",
+
+    /**
     * Method: updateBackBuffer
     * Update the <backBufferData>, and return a new or reposition the
     * backBuffer. When a backbuffer is returned, the tile's markup is not

Modified: trunk/openlayers/lib/OpenLayers/Tile/Image.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Tile/Image.js	2011-08-13 08:15:36 UTC (rev 12243)
+++ trunk/openlayers/lib/OpenLayers/Tile/Image.js	2011-08-13 09:17:24 UTC (rev 12244)
@@ -39,16 +39,7 @@
      */ 
     frame: null, 
 
-    /**
-     * Property: blankImageUrl
-     * {String} Does not result in a blank image on all browsers, but this is
-     * only required in some browsers as transparent backgroundImage, or as
-     * temporary image src while the tile is invisible and loading, so we don't
-     * care.
-     */
-    blankImageUrl: "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAQAIBRAA7",
-
-     /** 
+    /** 
      * Property: imageReloadAttempts
      * {Integer} Attempts to load the image.
      */
@@ -283,9 +274,10 @@
      * url - {String} or undefined to hide the image
      */
     setImgSrc: function(url) {
-        var img = this.imgDiv;
-        img.style.display = "none";
-        img.src = url ? url : this.blankImageUrl;
+        this.imgDiv.style.display = "none";
+        if (url) {
+            this.imgDiv.src = url;
+        }
     },
     
     /**