var y_labels = parent.getElementsByClassName("dygraph-axis-label-y" + axis_num);
var ary = [];
for (var i = 0; i < y_labels.length; i++) {
- ary.push(y_labels[i].innerHTML);
+ ary.push(y_labels[i].innerHTML.replace(/ | /g, ' '));
}
return ary;
};
var x_labels = parent.getElementsByClassName("dygraph-axis-label-x");
var ary = [];
for (var i = 0; i < x_labels.length; i++) {
- ary.push(x_labels[i].innerHTML);
+ ary.push(x_labels[i].innerHTML.replace(/ | /g, ' '));
}
return ary;
};
* Assert that all elements have a certain style property.
*/
Util.assertStyleOfChildren = function(selector, property, expectedValue) {
- assertTrue(selector.length > 0);
+ assert.isTrue(selector.length > 0);
$.each(selector, function(idx, child) {
- assertEquals(expectedValue, $(child).css(property));
+ assert.isEqual(expectedValue, $(child).css(property));
});
};
// TODO(danvk): Any performance issues with this?
var imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
- var i = 4 * (x + imageData.width * y);
+ var scale = Dygraph.getContextPixelRatio(ctx);
+
+ var i = 4 * (x * scale + imageData.width * y * scale);
var d = imageData.data;
return [d[i], d[i+1], d[i+2], d[i+3]];
};
this.responseText = data;
};
FakeXMLHttpRequest.restore = function() {
- XMLHttpRequest = originalXMLHttpRequest;
+ window.XMLHttpRequest = originalXMLHttpRequest;
};
FakeXMLHttpRequest.respond = function() {
for (var i = 0; i < requests.length; i++) {
}
FakeXMLHttpRequest.restore();
};
- XMLHttpRequest = FakeXMLHttpRequest;
+ window.XMLHttpRequest = FakeXMLHttpRequest;
return FakeXMLHttpRequest;
};
/**
* Format a date as 2000/01/23
- * @param {number} date_ms Millis since epoch.
+ * @param {number} dateMillis Millis since epoch.
* @return {string} The date formatted as YYYY-MM-DD.
*/
-Util.formatDate = function(date_ms) {
- var zeropad = function(x) { if (x < 10) return "0" + x; else return "" + x; };
- var d = new Date(date_ms);
-
- // Get the year:
- var year = "" + d.getFullYear();
- // Get a 0 padded month string
- var month = zeropad(d.getMonth() + 1); //months are 0-offset, sigh
- // Get a 0 padded day string
- var day = zeropad(d.getDate());
-
- return year + "/" + month + "/" + day;
+Util.formatDate = function(dateMillis) {
+ return Dygraph.dateString_(dateMillis).slice(0, 10); // 10 == "YYYY/MM/DD".length
};