From ae2036b4f22c2e14d2d6fddc395d4d9cc2b6dae7 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Thu, 12 Feb 2015 15:56:14 +0000 Subject: [PATCH] fixed the Chart.js tooltipLabels hack to work correctly with a single data set. --- codepot/src/codepot/views/code_file.php | 4 ++++ codepot/src/js/Chart.js | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/codepot/src/codepot/views/code_file.php b/codepot/src/codepot/views/code_file.php index 5a51da3f..90cbea21 100644 --- a/codepot/src/codepot/views/code_file.php +++ b/codepot/src/codepot/views/code_file.php @@ -170,6 +170,10 @@ $this->load->view ( "code/diff/{$project->id}/{$xpar}{$revreq}", $this->lang->line('Difference')); print ' | '; + print anchor ( + "code/fulldiff/{$project->id}/{$xpar}{$revreq}", + $this->lang->line('Full Difference')); + print ' | '; if ($revision > 0) diff --git a/codepot/src/js/Chart.js b/codepot/src/js/Chart.js index e35d34f0..089b1995 100644 --- a/codepot/src/js/Chart.js +++ b/codepot/src/js/Chart.js @@ -164,7 +164,10 @@ tooltipXOffset: 10, // String - Template string for single tooltips - tooltipTemplate: "<%if (label){%><%=label%>: <%}%><%= value %>", + // HYUNG-HWAN + //tooltipTemplate: "<%if (label){%><%=label%>: <%}%><%= value %>", + tooltipTemplate: "<%if (tooltipLabel) {%><%=tooltipLabel%>: <%} else if (label){%><%=label%>: <%}%><%= value %>", + // END HYUNG-HWAN // String - Template string for single tooltips multiTooltipTemplate: "<%= value %>",