From 0daaa120595411569452f656614d98c329d3167b Mon Sep 17 00:00:00 2001 From: ahocevar Date: Sat, 13 Aug 2011 08:15:36 +0000 Subject: [PATCH] using blank image to avoid the "Loading Image" frames on Firefox that were discussed during the review (see #3419) git-svn-id: http://svn.openlayers.org/trunk/openlayers@12243 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf --- lib/OpenLayers/Tile/Image.js | 20 ++++++++++++++------ lib/OpenLayers/Tile/Image/IFrame.js | 12 ++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/OpenLayers/Tile/Image.js b/lib/OpenLayers/Tile/Image.js index 2f04344d0d..1a63687385 100644 --- a/lib/OpenLayers/Tile/Image.js +++ b/lib/OpenLayers/Tile/Image.js @@ -39,7 +39,16 @@ OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile.BackBufferable, { */ 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 @@ OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile.BackBufferable, { * 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 @@ OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile.BackBufferable, { CLASS_NAME: "OpenLayers.Tile.Image" -}); \ No newline at end of file +}); diff --git a/lib/OpenLayers/Tile/Image/IFrame.js b/lib/OpenLayers/Tile/Image/IFrame.js index 6bc7655d1f..931bbd24b0 100644 --- a/lib/OpenLayers/Tile/Image/IFrame.js +++ b/lib/OpenLayers/Tile/Image/IFrame.js @@ -28,15 +28,7 @@ OpenLayers.Tile.Image.IFrame = { */ 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 , and return a new or reposition the * backBuffer. When a backbuffer is returned, the tile's markup is not @@ -193,4 +185,4 @@ OpenLayers.Tile.Image.IFrame = { } } -}; \ No newline at end of file +};