Merge pull request openlayers#843 from ahocevar/early-loadend

Safeguard against listeners that recreate the grid. r=@bartvde
perrygeo · Jan 17, 2013 · 32d7e02 · 32d7e02
2 parents 0f9010c + c742c14
commit 32d7e02
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/OpenLayers/Layer/Grid.js b/lib/OpenLayers/Layer/Grid.js
@@ -1104,8 +1104,6 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
             }
             //if that was the last tile, then trigger a 'loadend' on the layer
             if (this.numLoadingTiles === 0) {
-                this.loading = false;
-                this.events.triggerEvent("loadend");
                 if(this.backBuffer) {
                     this._transitionElement = tile.imgDiv;
                     for (var i=this.transitionendEvents.length-1; i>=0; --i) {
@@ -1119,6 +1117,8 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
                         this._removeBackBuffer, this.removeBackBufferDelay
                     );
                 }
+                this.loading = false;
+                this.events.triggerEvent("loadend");
             }
         };