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

Merge pull request #2 from tschaub/fade

Browse Source 
tweaks for fade changes
This commit is contained in:
Éric Lemoine
2012-01-02 11:16:57 -08:00
parent e11e4358fa 3eb34f587e
commit aeccee865c
4 changed files with 61 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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<props.length; i++) {
if(props[i] in style) {
return props[i];
}
}
return false;
}
var TRANSITION = testProp([
'transition', 'webkitTransition', 'MozTransition'
]);
var TRANSITION_END = TRANSITION === 'webkitTransition' ?
TRANSITION + 'End' : 'transitionend';
/**
* Constant: OpenLayers.Tile.Image.TRANSITION
*/
OpenLayers.Tile.Image.TRANSITION = TRANSITION;
/**
* Constant: OpenLayers.Tile.Image.TRANSITION_END
*/
OpenLayers.Tile.Image.TRANSITION_END = TRANSITION_END;
})();

28
lib/OpenLayers/Util.js
View File

@@ -1435,34 +1435,6 @@ OpenLayers.BROWSER_NAME = (function() {
return name;
})();
(function() {
function testProp(props) {
var style = document.documentElement.style;
for (var i=0; i<props.length; i++) {
if(props[i] in style) {
return props[i];
}
}
return false;
}
/**
* Constant: TRANSITION
*/
OpenLayers.TRANSITION = testProp([
'transition', 'webkitTransition', 'MozTransition'
]);
/**
* Constant: OpenLayers.TRANSITION_END
*/
OpenLayers.TRANSITION_END = OpenLayers.TRANSITION === 'webkitTransition' ?
OpenLayers.TRANSITION + 'End' : 'transitionend';
})();
/**
* Function: getBrowserName
*

19
tests/Layer/WMS.html
View File

@@ -271,6 +271,25 @@
}
function test_setOpacity(t) {
t.plan(1);
var layer = new OpenLayers.Layer.WMS(
null, "/bogus/wms", {layers: "mylayer"}
);
var map = new OpenLayers.Map("map");
map.addLayer(layer);
map.zoomToMaxExtent();
layer.setOpacity(0.5);
t.delay_call(1, function() {
t.eq(parseFloat(layer.div.firstChild.style.opacity), 0.5, "opacity set");
map.destroy();
});
}
function test_Layer_WMS_noGutters (t) {
t.plan(2);
var map = new OpenLayers.Map('map');

16
tests/Tile/Image.html
View File

@@ -357,9 +357,9 @@
var log;
tile.events.on({loadend: function() { log++; }});
var T = OpenLayers.TRANSITION;
var TE = OpenLayers.TRANSITION_END;
OpenLayers.TRANSITION_END = 'transitionend';
var T = OpenLayers.Tile.Image.TRANSITION;
var TE = OpenLayers.Tile.Image.TRANSITION_END;
OpenLayers.Tile.Image.TRANSITION_END = 'transitionend';
function firstObserverName() {
var cacheID = tile.imgDiv._eventCacheID,
@@ -367,7 +367,7 @@
return observers && observers.length > 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;
}
</script>