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

IE9 fixes

Browse Source
This commit is contained in:
javi 2013-11-22 15:08:47 +01:00
parent f8f35c6a33
commit 69db609a25
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/torque/animator.js
View File

@ -4,7 +4,7 @@
var requestAnimationFrame = window.requestAnimationFrame || window.mozRequestAnimationFrame || window.webkitRequestAnimationFrame || window.msRequestAnimationFrame || function(c) { setTimeout(c, 16); } 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: * options:

8
lib/torque/cartocss_reference.js
View File

@ -49,19 +49,19 @@ var _torque_reference_latest = {
"default-value": "30", "default-value": "30",
"type":"number", "type":"number",
"default-meaning": "the animation lasts 30 seconds", "default-meaning": "the animation lasts 30 seconds",
"doc": "Animation duration in seconds", "doc": "Animation duration in seconds"
}, },
"-torque-aggregation-function": { "-torque-aggregation-function": {
"default-value": "count(cartodb_id)", "default-value": "count(cartodb_id)",
"type": "string", "type": "string",
"default-meaning": "the value for each cell is the count of points in that cell", "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": { "-torque-time-attribute": {
"default-value": "time", "default-value": "time",
"type": "string", "type": "string",
"default-meaning": "the data column in your table that is of a time based type", "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": { "-torque-data-aggregation": {
"default-value": "linear", "default-value": "linear",
@ -69,7 +69,7 @@ var _torque_reference_latest = {
"cumulative" "cumulative"
], ],
"default-meaning": "previous values are discarded", "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" : { "symbolizers" : {

3
lib/torque/request.js
View File

@ -50,6 +50,7 @@
if (window.XDomainRequest if (window.XDomainRequest
&& !("withCredentials" in request) && !("withCredentials" in request)
&& /^(http(s)?:)?\/\//.test(url)) request = XDomainRequest; && /^(http(s)?:)?\/\//.test(url)) request = XDomainRequest;
var req = new request(); var req = new request();
@ -66,6 +67,8 @@
? req.onload = req.onerror = respond ? req.onload = req.onerror = respond
: req.onreadystatechange = function() { req.readyState > 3 && respond(); }; : req.onreadystatechange = function() { req.readyState > 3 && respond(); };
req.onprogress = function() {};
req.open(options.method, url, true); req.open(options.method, url, true);
//req.responseType = 'arraybuffer'; //req.responseType = 'arraybuffer';
if (options.data) { if (options.data) {