Recovering from merge conflicts
This commit is contained in:
@@ -1143,11 +1143,16 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
|
||||
this.loading = false;
|
||||
this.events.triggerEvent("loadend");
|
||||
if(this.backBuffer) {
|
||||
// the removal of the back buffer is delayed to prevent flash
|
||||
// effects due to the animation of tile displaying
|
||||
this._transitionElement = tile.imgDiv;
|
||||
for (var i=this.transitionendEvents.length-1; i>=0; --i) {
|
||||
OpenLayers.Event.observe(this._transitionElement,
|
||||
this.transitionendEvents[i],
|
||||
this._removeBackBuffer);
|
||||
}
|
||||
// the removal of the back buffer is delayed to prevent
|
||||
// flash effects due to the animation of tile displaying
|
||||
this.backBufferTimerId = window.setTimeout(
|
||||
OpenLayers.Function.bind(this.removeBackBuffer, this),
|
||||
this.removeBackBufferDelay
|
||||
this._removeBackBuffer, this.removeBackBufferDelay
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user