aboutsummaryrefslogtreecommitdiffstats
path: root/web/js/dashboard.js
diff options
context:
space:
mode:
authorMatthew Somerville <matthew-github@dracos.co.uk>2018-04-10 10:02:05 +0100
committerMatthew Somerville <matthew-github@dracos.co.uk>2018-04-10 10:02:05 +0100
commitcae3b297d284a62f2b12145bd2328aabb04de39b (patch)
treeb3ce1a0ad6d8eab2619ba7298e12c3ad987666be /web/js/dashboard.js
parentb56b3c521730f7d4f96760a931f50683b7b81fa4 (diff)
parent6d058ab426fa8083b35b1a635a19533ee4f0c388 (diff)
Merge branch 'issues/2005-ie-chart-fixes'
Diffstat (limited to 'web/js/dashboard.js')
-rw-r--r--web/js/dashboard.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/web/js/dashboard.js b/web/js/dashboard.js
index 23c5496e6..82b5e6188 100644
--- a/web/js/dashboard.js
+++ b/web/js/dashboard.js
@@ -1,4 +1,7 @@
$(function(){
+ if ($('html').is('.ie9')) {
+ return;
+ }
Chart.defaults.global.defaultFontSize = 16;
// Chart.defaults.global.defaultFontFamily = $('body').css('font-family');
@@ -24,7 +27,6 @@ $(function(){
var setUpLabelsForChart = function(chart){
var $parent = $(chart.chart.canvas).parent();
- var xGutterInPixels = 30;
var lasty = 0;
$.each(chart.config.data.datasets, function(datasetIndex, dataset){
@@ -35,8 +37,7 @@ $(function(){
y = lasty;
}
$label.css({
- top: y,
- left: latestPoint._model.x + xGutterInPixels
+ top: y
});
lasty = y + $label.height() + 8;
});