ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #954 from ahocevar/url-compare

Browse Source 
URL comparison fails in IE8. r=@bartvde
This commit is contained in:
ahocevar
2013-04-24 07:36:44 -07:00
parent 11977f57a3 2782fa47c8
commit 6af9f5f3d3
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/OpenLayers/Tile/Image.js
View File

@@ -7,6 +7,7 @@
/**
* @requires OpenLayers/Tile.js
* @requires OpenLayers/Animation.js
* @requires OpenLayers/Util.js
*/
/**
@@ -317,7 +318,7 @@ OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile, {
this.layer.div.appendChild(this.getTile());
this.events.triggerEvent(this._loadEvent);
var img = this.getImage();
if (this.url && img.getAttribute("src") == this.url) {
if (this.url && OpenLayers.Util.isEquivalentUrl(img.src, this.url)) {
this._loadTimeout = window.setTimeout(
OpenLayers.Function.bind(this.onImageLoad, this), 0
);

19
tests/TileManager.html
View File

@@ -64,17 +64,28 @@
gridSize = layer.div.childNodes.length;
map.setCenter([17, 47]);
});
function inCache(img) {
var search = img.src.split('?')[1];
for (var s in tileManager.tileCache) {
if (s.split('?')[1] == search) {
return true;
}
}
return false;
}
t.delay_call(4, function() {
t.eq(tileManager.tileCacheIndex.length, 12, "tiles cached");
t.ok(tileManager.tileCache[layer.grid[1][2].url] === layer.grid[1][2].imgDiv, "correct object cached");
t.ok(!(firstInCache.getAttribute("src") in tileManager.tileCache), "old tile discarded");
t.ok(sharedTile.getAttribute("src") in tileManager.tileCache, "shared tile still in cache");
t.ok(!inCache(firstInCache), "old tile discarded");
t.ok(inCache(sharedTile), "shared tile still in cache");
firstInCache = tileManager.tileCache[tileManager.tileCacheIndex[0]];
map.setCenter([16, 48]);
});
t.delay_call(6, function() {
t.ok(!(firstInCache.getAttribute("src") in tileManager.tileCache), "old tile discarded");
t.ok(sharedTile.getAttribute("src") in tileManager.tileCache, "shared tile still in cache");
t.ok(!inCache(firstInCache), "old tile discarded");
t.ok(inCache(sharedTile), "shared tile still in cache");
t.eq(layer.div.childNodes.length, gridSize, 'no unused images left in dom');
map.destroy();
});