From 56e352b7aa642f0599833c748632481916435e63 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Fri, 20 Sep 2013 13:37:31 +0100 Subject: [PATCH 1/2] Dispatch change events instead of load events when sources change --- src/ol/source/bingmapssource.js | 2 +- src/ol/source/tilejsonsource.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ol/source/bingmapssource.js b/src/ol/source/bingmapssource.js index 470194b511..7b75a68b3c 100644 --- a/src/ol/source/bingmapssource.js +++ b/src/ol/source/bingmapssource.js @@ -140,7 +140,7 @@ ol.source.BingMaps.prototype.handleImageryMetadataResponse = this.ready_ = true; - this.dispatchLoadEvent(); + this.dispatchChangeEvent(); }; diff --git a/src/ol/source/tilejsonsource.js b/src/ol/source/tilejsonsource.js index e864f80a19..9d790cb942 100644 --- a/src/ol/source/tilejsonsource.js +++ b/src/ol/source/tilejsonsource.js @@ -119,7 +119,7 @@ ol.source.TileJSON.prototype.handleTileJSONResponse = function() { this.ready_ = true; - this.dispatchLoadEvent(); + this.dispatchChangeEvent(); }; From bd81e6c9a9732188163cf735e8cadb8cd73f4dcb Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Fri, 20 Sep 2013 13:37:40 +0100 Subject: [PATCH 2/2] Remove source load events --- src/ol/layer/layer.js | 21 --------------------- src/ol/layer/layerbase.js | 3 +-- src/ol/source/source.js | 9 --------- 3 files changed, 1 insertion(+), 32 deletions(-) diff --git a/src/ol/layer/layer.js b/src/ol/layer/layer.js index ef5a60fb0d..18ec52032a 100644 --- a/src/ol/layer/layer.js +++ b/src/ol/layer/layer.js @@ -31,23 +31,10 @@ ol.layer.Layer = function(options) { goog.events.listen(this.source_, goog.events.EventType.CHANGE, this.handleSourceChange_, false, this); - if (!this.source_.isReady()) { - goog.events.listenOnce(this.source_, goog.events.EventType.LOAD, - this.handleSourceLoad_, false, this); - } - }; goog.inherits(ol.layer.Layer, ol.layer.Base); -/** - * @private - */ -ol.layer.Layer.prototype.dispatchLoadEvent_ = function() { - this.dispatchEvent(goog.events.EventType.LOAD); -}; - - /** * @inheritDoc */ @@ -89,14 +76,6 @@ ol.layer.Layer.prototype.handleSourceChange_ = function() { }; -/** - * @private - */ -ol.layer.Layer.prototype.handleSourceLoad_ = function() { - this.dispatchLoadEvent_(); -}; - - /** * @inheritDoc */ diff --git a/src/ol/layer/layerbase.js b/src/ol/layer/layerbase.js index 30c8f8f2e5..3af07a06d1 100644 --- a/src/ol/layer/layerbase.js +++ b/src/ol/layer/layerbase.js @@ -78,8 +78,7 @@ ol.layer.Base = function(options) { ol.Object.getChangeEventType(ol.layer.LayerProperty.OPACITY), ol.Object.getChangeEventType(ol.layer.LayerProperty.SATURATION), ol.Object.getChangeEventType(ol.layer.LayerProperty.MAX_RESOLUTION), - ol.Object.getChangeEventType(ol.layer.LayerProperty.MIN_RESOLUTION), - goog.events.EventType.LOAD + ol.Object.getChangeEventType(ol.layer.LayerProperty.MIN_RESOLUTION) ], this.handleLayerChange, false, this); diff --git a/src/ol/source/source.js b/src/ol/source/source.js index 2f1f0db681..a5a25f5eb8 100644 --- a/src/ol/source/source.js +++ b/src/ol/source/source.js @@ -64,15 +64,6 @@ ol.source.Source.prototype.dispatchChangeEvent = function() { }; -/** - * @protected - */ -ol.source.Source.prototype.dispatchLoadEvent = function() { - ++this.revision_; - this.dispatchEvent(goog.events.EventType.LOAD); -}; - - /** * @return {Array.} Attributions. */