cartodb/torque
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #197 from CartoDB/providerload

Browse Source 
renderer and provider are loaded before options.ready is defined, to prevent them from being called before their initialization
This commit is contained in:
Dani Carrión 2015-06-23 16:24:55 +02:00
commit be7046e5a0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/torque/leaflet/torque.js
View File

@ -66,6 +66,9 @@ L.TorqueLayer = L.CanvasLayer.extend({
this.options.renderer = this.options.renderer || 'point'; this.options.renderer = this.options.renderer || 'point';
this.options.provider = this.options.provider || 'windshaft'; this.options.provider = this.options.provider || 'windshaft';
this.provider = new this.providers[this.options.provider](options);
this.renderer = new this.renderers[this.options.renderer](this.getCanvas(), options);
options.ready = function() { options.ready = function() {
self.fire("change:bounds", { self.fire("change:bounds", {
bounds: self.provider.getBounds() bounds: self.provider.getBounds()
@ -78,9 +81,6 @@ L.TorqueLayer = L.CanvasLayer.extend({
self.setKey(self.key); self.setKey(self.key);
}; };
this.provider = new this.providers[this.options.provider](options);
this.renderer = new this.renderers[this.options.renderer](this.getCanvas(), options);
this.renderer.on("allIconsLoaded", this.render.bind(this)); this.renderer.on("allIconsLoaded", this.render.bind(this));