From c44c689ebf4ce3c21aff722ebf980495598c5d71 Mon Sep 17 00:00:00 2001
From: Anil Mandepudi <pichalite@users.noreply.github.com>
Date: Tue, 9 Aug 2016 07:54:58 -0700
Subject: [PATCH] fixes #4921 (#4922)

---
 public/src/admin/advanced/errors.js   | 66 +++++++++++++++++++--------
 public/src/admin/general/dashboard.js |  3 +-
 2 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/public/src/admin/advanced/errors.js b/public/src/admin/advanced/errors.js
index 2e72bcceb5..52d6427240 100644
--- a/public/src/admin/advanced/errors.js
+++ b/public/src/admin/advanced/errors.js
@@ -29,7 +29,7 @@ define('admin/advanced/errors', ['Chart'], function(Chart) {
 		dailyLabels = dailyLabels.slice(-7);
 
 		if (utils.isMobile()) {
-			Chart.defaults.global.showTooltips = false;
+			Chart.defaults.global.tooltips.enabled = false;
 		}
 
 		var data = {
@@ -38,12 +38,12 @@ define('admin/advanced/errors', ['Chart'], function(Chart) {
 				datasets: [
 					{
 						label: "",
-						fillColor: "rgba(186,139,175,0.2)",
-						strokeColor: "rgba(186,139,175,1)",
-						pointColor: "rgba(186,139,175,1)",
-						pointStrokeColor: "#fff",
-						pointHighlightFill: "#fff",
-						pointHighlightStroke: "rgba(186,139,175,1)",
+						backgroundColor: "rgba(186,139,175,0.2)",
+						borderColor: "rgba(186,139,175,1)",
+						pointBackgroundColor: "rgba(186,139,175,1)",
+						pointHoverBackgroundColor: "#fff",
+						pointBorderColor: "#fff",
+						pointHoverBorderColor: "rgba(186,139,175,1)",
 						data: ajaxify.data.analytics['not-found']
 					}
 				]
@@ -53,12 +53,12 @@ define('admin/advanced/errors', ['Chart'], function(Chart) {
 				datasets: [
 					{
 						label: "",
-						fillColor: "rgba(151,187,205,0.2)",
-						strokeColor: "rgba(151,187,205,1)",
-						pointColor: "rgba(151,187,205,1)",
-						pointStrokeColor: "#fff",
-						pointHighlightFill: "#fff",
-						pointHighlightStroke: "rgba(151,187,205,1)",
+						backgroundColor: "rgba(151,187,205,0.2)",
+						borderColor: "rgba(151,187,205,1)",
+						pointBackgroundColor: "rgba(151,187,205,1)",
+						pointHoverBackgroundColor: "#fff",
+						pointBorderColor: "#fff",
+						pointHoverBorderColor: "rgba(151,187,205,1)",
 						data: ajaxify.data.analytics['toobusy']
 					}
 				]
@@ -67,13 +67,41 @@ define('admin/advanced/errors', ['Chart'], function(Chart) {
 
 		notFoundCanvas.width = $(notFoundCanvas).parent().width();
 		tooBusyCanvas.width = $(tooBusyCanvas).parent().width();
-		new Chart(notFoundCanvas.getContext('2d')).Line(data['not-found'], {
-			responsive: true,
-			animation: false
+		
+		new Chart(notFoundCanvas.getContext('2d'), {
+			type: 'line',
+			data: data['not-found'],
+			options: {
+				responsive: true,
+				legend: {
+					display: false
+				},
+				scales: {
+					yAxes: [{
+						ticks: {
+							beginAtZero: true
+						}
+					}]
+				}
+			}
 		});
-		new Chart(tooBusyCanvas.getContext('2d')).Line(data['toobusy'], {
-			responsive: true,
-			animation: false
+		
+		new Chart(tooBusyCanvas.getContext('2d'), {
+			type: 'line',
+			data: data['toobusy'],
+			options: {
+				responsive: true,
+				legend: {
+					display: false
+				},
+				scales: {
+					yAxes: [{
+						ticks: {
+							beginAtZero: true
+						}
+					}]
+				}
+			}
 		});
 	};
 
diff --git a/public/src/admin/general/dashboard.js b/public/src/admin/general/dashboard.js
index 1071c76b0d..1224d2ace2 100644
--- a/public/src/admin/general/dashboard.js
+++ b/public/src/admin/general/dashboard.js
@@ -165,8 +165,7 @@ define('admin/general/dashboard', ['semver', 'Chart'], function(semver, Chart) {
 			trafficLabels = utils.getHoursArray();
 
 		if (isMobile) {
-			Chart.defaults.global.showTooltips = false;
-			Chart.defaults.global.animation = false;
+			Chart.defaults.global.tooltips.enabled = false;
 		}
 
 		var data = {