diff --git a/lib/torque/animator.js b/lib/torque/animator.js index 35c732e..6634a5b 100644 --- a/lib/torque/animator.js +++ b/lib/torque/animator.js @@ -4,7 +4,7 @@ var requestAnimationFrame = window.requestAnimationFrame || window.mozRequestAnimationFrame || window.webkitRequestAnimationFrame || window.msRequestAnimationFrame || function(c) { setTimeout(c, 16); } - var cancelAnimationFrame = window.requestAnimationFrame || window.mozCancelAnimationFrame || window.webkitRequestAnimationFrame || window.msRequestAnimationFrame || function(c) { cancelTimeout(c); }; + var cancelAnimationFrame = window.requestAnimationFrame || window.mozCancelAnimationFrame || window.webkitRequestAnimationFrame || window.msRequestAnimationFrame || function(c) { }; /** * options: diff --git a/lib/torque/cartocss_reference.js b/lib/torque/cartocss_reference.js index 4fc45b6..93f812c 100644 --- a/lib/torque/cartocss_reference.js +++ b/lib/torque/cartocss_reference.js @@ -49,19 +49,19 @@ var _torque_reference_latest = { "default-value": "30", "type":"number", "default-meaning": "the animation lasts 30 seconds", - "doc": "Animation duration in seconds", + "doc": "Animation duration in seconds" }, "-torque-aggregation-function": { "default-value": "count(cartodb_id)", "type": "string", "default-meaning": "the value for each cell is the count of points in that cell", - "doc": "A function used to calculate a value from the aggregate data for each cell. See -torque-resolution", + "doc": "A function used to calculate a value from the aggregate data for each cell. See -torque-resolution" }, "-torque-time-attribute": { "default-value": "time", "type": "string", "default-meaning": "the data column in your table that is of a time based type", - "doc": "The table column that contains the time information used create the animation", + "doc": "The table column that contains the time information used create the animation" }, "-torque-data-aggregation": { "default-value": "linear", @@ -69,7 +69,7 @@ var _torque_reference_latest = { "cumulative" ], "default-meaning": "previous values are discarded", - "doc": "A linear animation will discard previous values while a cumulative animation will accumulate them until it restarts", + "doc": "A linear animation will discard previous values while a cumulative animation will accumulate them until it restarts" } }, "symbolizers" : { diff --git a/lib/torque/request.js b/lib/torque/request.js index 6e14690..f92d570 100644 --- a/lib/torque/request.js +++ b/lib/torque/request.js @@ -50,6 +50,7 @@ if (window.XDomainRequest && !("withCredentials" in request) && /^(http(s)?:)?\/\//.test(url)) request = XDomainRequest; + var req = new request(); @@ -66,6 +67,8 @@ ? req.onload = req.onerror = respond : req.onreadystatechange = function() { req.readyState > 3 && respond(); }; + req.onprogress = function() {}; + req.open(options.method, url, true); //req.responseType = 'arraybuffer'; if (options.data) {