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

[commits-20090109 at openlayers.org]

Author: ahocevar
Date: 2011-08-13 01:15:36 -0700 (Sat, 13 Aug 2011)
New Revision: 12243

Modified:
   trunk/openlayers/lib/OpenLayers/Tile/Image.js
   trunk/openlayers/lib/OpenLayers/Tile/Image/IFrame.js
Log:
using blank image to avoid the "Loading Image" frames on Firefox that were discussed during the review (see #3419)

Modified: trunk/openlayers/lib/OpenLayers/Tile/Image/IFrame.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Tile/Image/IFrame.js	2011-08-13 02:49:25 UTC (rev 12242)
+++ trunk/openlayers/lib/OpenLayers/Tile/Image/IFrame.js	2011-08-13 08:15:36 UTC (rev 12243)
@@ -28,15 +28,7 @@
      */ 
     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
@@ -193,4 +185,4 @@
         }
     }
 
-};
\ No newline at end of file
+};

Modified: trunk/openlayers/lib/OpenLayers/Tile/Image.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Tile/Image.js	2011-08-13 02:49:25 UTC (rev 12242)
+++ trunk/openlayers/lib/OpenLayers/Tile/Image.js	2011-08-13 08:15:36 UTC (rev 12243)
@@ -39,7 +39,16 @@
      */ 
     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.
      */
@@ -274,10 +283,9 @@
      * url - {String} or undefined to hide the image
      */
     setImgSrc: function(url) {
-        this.imgDiv.style.display = "none";
-        if (url) {
-            this.imgDiv.src = url;
-        }
+        var img = this.imgDiv;
+        img.style.display = "none";
+        img.src = url ? url : this.blankImageUrl;
     },
     
     /**
@@ -342,4 +350,4 @@
 
     CLASS_NAME: "OpenLayers.Tile.Image"
 
-});
\ No newline at end of file
+});