diff --git a/lib/OpenLayers/Tile/Image.js b/lib/OpenLayers/Tile/Image.js index 3ee6c0aa1c..1a4ce1ffa0 100644 --- a/lib/OpenLayers/Tile/Image.js +++ b/lib/OpenLayers/Tile/Image.js @@ -362,12 +362,12 @@ OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile, { var opacity = this.layer.opacity, tileAnimation = this.layer.map.tileAnimation; - if (OpenLayers.TRANSITION && tileAnimation && opacity) { + if (OpenLayers.Tile.Image.TRANSITION && tileAnimation && opacity) { // if the displaying of the tile is animated we delay the // loadend event until after the end of the transition, this // to avoid flash effects because the backbuffer is removed // before the tile is actually displayed - OpenLayers.Event.observe(img, OpenLayers.TRANSITION_END, + OpenLayers.Event.observe(img, OpenLayers.Tile.Image.TRANSITION_END, OpenLayers.Function.bind(this.onTransitionEnd, this) ); } @@ -376,7 +376,7 @@ OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile, { img.style.opacity = opacity; img.style.filter = 'alpha(opacity=' + (opacity * 100) + ')'; - if (!OpenLayers.TRANSITION || !tileAnimation || !opacity) { + if (!OpenLayers.Tile.Image.TRANSITION || !tileAnimation || !opacity) { this.isLoading = false; this.events.triggerEvent("loadend"); } @@ -432,3 +432,34 @@ OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile, { CLASS_NAME: "OpenLayers.Tile.Image" }); + +// Test for support of CSS transitions and store appropriate property names +(function() { + function testProp(props) { + var style = document.documentElement.style; + for (var i=0; i 0 ? observers[0].name : undefined; } - OpenLayers.TRANSITION = true; + OpenLayers.Tile.Image.TRANSITION = true; map.tileAnimation = true; log = 0; tile.onImageLoad(); @@ -381,7 +381,7 @@ '[a] onImageLoad registers a transitionend observer'); OpenLayers.Event.stopObservingElement(tile.imgDiv); - OpenLayers.TRANSITION = true; + OpenLayers.Tile.Image.TRANSITION = true; map.tileAnimation = false; log = 0; tile.onImageLoad(); @@ -395,7 +395,7 @@ '[b] onImageLoad does not register a transitionend observer'); OpenLayers.Event.stopObservingElement(tile.imgDiv); - OpenLayers.TRANSITION = false; + OpenLayers.Tile.Image.TRANSITION = false; map.tileAnimation = true; log = 0; tile.onImageLoad(); @@ -410,8 +410,8 @@ OpenLayers.Event.stopObservingElement(tile.imgDiv); map.destroy(); - OpenLayers.TRANSITION = T; - OpenLayers.TRANSITION_END = TE; + OpenLayers.Tile.Image.TRANSITION = T; + OpenLayers.Tile.Image.TRANSITION_END = TE; }