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

reverts changes to dist in d82fe9d057

Browse Source
This commit is contained in:
Francisco Dans 2014-12-16 18:29:59 +01:00
parent 495082c29e
commit 68c68f3a02
3 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dist/torque.full.js vendored
View File

File diff suppressed because one or more lines are too long

6
dist/torque.js vendored
View File

File diff suppressed because one or more lines are too long

15
dist/torque.uncompressed.js vendored
View File

@ -29,11 +29,10 @@ var cancelAnimationFrame = global.cancelAnimationFrame
this._t0 = +new Date(); this._t0 = +new Date();
this.callback = callback; this.callback = callback;
this._time = 0.0; this._time = 0.0;
this.options = torque.extend({ this.options = torque.extend({
animationDelay: 0, animationDelay: 0,
maxDelta: 0.2, maxDelta: 0.2,
loop: options.loop || true loop: true
}, this.options); }, this.options);
this.rescale(); this.rescale();
@ -121,9 +120,6 @@ var cancelAnimationFrame = global.cancelAnimationFrame
this.time(this._time); this.time(this._time);
if(this.step() >= this.options.steps) { if(this.step() >= this.options.steps) {
this._time = 0; this._time = 0;
if(!this.options.loop){
this.stop();
}
} }
if(this.running) { if(this.running) {
requestAnimationFrame(this._tick); requestAnimationFrame(this._tick);
@ -2540,14 +2536,7 @@ L.TorqueLayer = L.CanvasLayer.extend({
var c = tile._tileCache = document.createElement('canvas'); var c = tile._tileCache = document.createElement('canvas');
c.width = c.height = tile_size; c.width = c.height = tile_size;
pos = this.getTilePos(tile.coord); pos = this.getTilePos(tile.coord);
// clip bounds, firefox raise an exception when try to get data from outside canvas c.getContext('2d').drawImage(this.getCanvas(), pos.x, pos.y, tile_size, tile_size, 0, 0, tile_size, tile_size);
var x = Math.max(0, pos.x)
var y = Math.max(0, pos.y)
var w = Math.min(tile_size, this.getCanvas().width - x);
var h = Math.min(tile_size, this.getCanvas().height - y);
if (w > 0 && h > 0) {
c.getContext('2d').drawImage(this.getCanvas(), x, y, w, h, x - pos.x, y - pos.y, w, h);
}
} }
} }
} }