From 3677699b56dc1356d450872d1f41428360f61d42 Mon Sep 17 00:00:00 2001 From: denz Date: Mon, 1 Jun 2015 11:19:12 +0900 Subject: [PATCH] bug fix. From string to Date conversion error in IE. --- .../webapp/features/cpuLoadChart/cpu-load-chart.directive.js | 3 ++- .../features/jvmMemoryChart/jvm-memory-chart.directive.js | 3 ++- web/src/main/webapp/features/loadChart/load-chart.directive.js | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web/src/main/webapp/features/cpuLoadChart/cpu-load-chart.directive.js b/web/src/main/webapp/features/cpuLoadChart/cpu-load-chart.directive.js index 3c7ea3269..942c657ee 100644 --- a/web/src/main/webapp/features/cpuLoadChart/cpu-load-chart.directive.js +++ b/web/src/main/webapp/features/cpuLoadChart/cpu-load-chart.directive.js @@ -113,7 +113,8 @@ "startOnAxis": true, "gridPosition": "start", "labelFunction": function (valueText, serialDataItem, categoryAxis) { - return new Date(valueText).toString('HH:mm:ss'); + return valueText.substring( valueText.indexOf( " " ) + 1 ); + //return new Date(valueText).toString('HH:mm:ss'); } } }; diff --git a/web/src/main/webapp/features/jvmMemoryChart/jvm-memory-chart.directive.js b/web/src/main/webapp/features/jvmMemoryChart/jvm-memory-chart.directive.js index b0f3daa71..e64cd0bd9 100644 --- a/web/src/main/webapp/features/jvmMemoryChart/jvm-memory-chart.directive.js +++ b/web/src/main/webapp/features/jvmMemoryChart/jvm-memory-chart.directive.js @@ -129,7 +129,8 @@ "startOnAxis": true, "gridPosition": "start", "labelFunction": function (valueText, serialDataItem, categoryAxis) { - return new Date(valueText).toString('HH:mm:ss'); + return valueText.substring( valueText.indexOf( " " ) + 1 ); + //return new Date(valueText).toString('HH:mm:ss'); } } }; diff --git a/web/src/main/webapp/features/loadChart/load-chart.directive.js b/web/src/main/webapp/features/loadChart/load-chart.directive.js index 97a7a59e6..45f1d97a3 100644 --- a/web/src/main/webapp/features/loadChart/load-chart.directive.js +++ b/web/src/main/webapp/features/loadChart/load-chart.directive.js @@ -86,7 +86,7 @@ // return category; // }, "labelFunction": function (valueText, serialDataItem, categoryAxis) { - return new Date(valueText).toString('HH:mm'); + return valueText.substring( valueText.indexOf( " " ) + 1 ); } }, "balloon": {