diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2018-02-19 20:43:10 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-19 20:43:10 +0000 |
commit | 834f455b43909525609a573df3153a413ef3c6d4 (patch) | |
tree | e876c18c5d30f27650ae96d3620dcdd0f0f5144f /app/assets/javascripts/graphs | |
parent | 8cfa5ccf5342f98aaf6b0a292d337d3211d5e7ff (diff) | |
download | gitlab-ce-834f455b43909525609a573df3153a413ef3c6d4.tar.gz |
Chart.html.haml refactor
Diffstat (limited to 'app/assets/javascripts/graphs')
-rw-r--r-- | app/assets/javascripts/graphs/graphs_bundle.js | 4 | ||||
-rw-r--r-- | app/assets/javascripts/graphs/graphs_charts.js | 61 |
2 files changed, 0 insertions, 65 deletions
diff --git a/app/assets/javascripts/graphs/graphs_bundle.js b/app/assets/javascripts/graphs/graphs_bundle.js deleted file mode 100644 index 534bc535bb6..00000000000 --- a/app/assets/javascripts/graphs/graphs_bundle.js +++ /dev/null @@ -1,4 +0,0 @@ -import Chart from 'vendor/Chart'; - -// export to global scope -window.Chart = Chart; diff --git a/app/assets/javascripts/graphs/graphs_charts.js b/app/assets/javascripts/graphs/graphs_charts.js deleted file mode 100644 index ec6eab34989..00000000000 --- a/app/assets/javascripts/graphs/graphs_charts.js +++ /dev/null @@ -1,61 +0,0 @@ -import Chart from 'vendor/Chart'; -import _ from 'underscore'; - -document.addEventListener('DOMContentLoaded', () => { - const projectChartData = JSON.parse(document.getElementById('projectChartData').innerHTML); - - const responsiveChart = (selector, data) => { - const options = { - scaleOverlay: true, - responsive: true, - pointHitDetectionRadius: 2, - maintainAspectRatio: false, - }; - // get selector by context - const ctx = selector.get(0).getContext('2d'); - // pointing parent container to make chart.js inherit its width - const container = $(selector).parent(); - const generateChart = () => { - selector.attr('width', $(container).width()); - if (window.innerWidth < 768) { - // Scale fonts if window width lower than 768px (iPad portrait) - options.scaleFontSize = 8; - } - return new Chart(ctx).Bar(data, options); - }; - // enabling auto-resizing - $(window).resize(generateChart); - return generateChart(); - }; - - const chartData = data => ({ - labels: Object.keys(data), - datasets: [{ - fillColor: 'rgba(220,220,220,0.5)', - strokeColor: 'rgba(220,220,220,1)', - barStrokeWidth: 1, - barValueSpacing: 1, - barDatasetSpacing: 1, - data: _.values(data), - }], - }); - - const hourData = chartData(projectChartData.hour); - responsiveChart($('#hour-chart'), hourData); - - const dayData = chartData(projectChartData.weekDays); - responsiveChart($('#weekday-chart'), dayData); - - const monthData = chartData(projectChartData.month); - responsiveChart($('#month-chart'), monthData); - - const data = projectChartData.languages; - const ctx = $('#languages-chart').get(0).getContext('2d'); - const options = { - scaleOverlay: true, - responsive: true, - maintainAspectRatio: false, - }; - - new Chart(ctx).Pie(data, options); -}); |