From 462d87c54b78f393d6fe0d3b06450311afab759b Mon Sep 17 00:00:00 2001 From: pratu16x7 Date: Wed, 8 Nov 2017 14:16:03 +0530 Subject: [PATCH] Update docs: dom element as parent, heatmap today fix --- README.md | 2 +- dist/frappe-charts.min.cjs.js | 21 +- dist/frappe-charts.min.css | 2 +- dist/frappe-charts.min.esm.js | 21 +- dist/frappe-charts.min.iife.js | 2 +- docs/assets/js/frappe-charts.min.js | 2 +- docs/assets/js/index.js | 7 +- docs/index.html | 2 +- src/scripts/charts/Heatmap.js | 4 + src/scripts/objects/SvgTip.js | 10 +- src/styles/charts.less | 669 ++++++++++++++-------------- 11 files changed, 377 insertions(+), 365 deletions(-) diff --git a/README.md b/README.md index cdc9199..fd00674 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ const data = { } const chart = new Chart({ - parent: '#chart', + parent: '#chart', // or a DOM element title: "My Awesome Chart", data: data, type: 'bar', // or 'line', 'scatter', 'pie', 'percentage' diff --git a/dist/frappe-charts.min.cjs.js b/dist/frappe-charts.min.cjs.js index b4c93a0..094af44 100644 --- a/dist/frappe-charts.min.cjs.js +++ b/dist/frappe-charts.min.cjs.js @@ -633,9 +633,11 @@ var SvgTip = function () { }, { key: 'calc_position', value: function calc_position() { + var width = this.container.offsetWidth; + this.top = this.y - this.container.offsetHeight; - this.left = this.x - this.container.offsetWidth / 2; - var max_left = this.parent.offsetWidth - this.container.offsetWidth; + this.left = this.x - width / 2; + var max_left = this.parent.offsetWidth - width; var pointer = this.container.querySelector('.svg-pointer'); @@ -644,7 +646,9 @@ var SvgTip = function () { this.left = 0; } else if (this.left > max_left) { var delta = this.left - max_left; - pointer.style.left = 'calc(50% + ' + delta + 'px)'; + var pointer_offset = 'calc(50% + ' + delta + 'px)'; + pointer.style.left = pointer_offset; + this.left = max_left; } else { pointer.style.left = '50%'; @@ -3024,6 +3028,7 @@ var Heatmap = function (_BaseChart) { var square_side = 10; var cell_padding = 2; var step = 1; + var today_time = this.today.getTime(); var month_change = 0; var week_col_change = 0; @@ -3067,6 +3072,8 @@ var Heatmap = function (_BaseChart) { var next_date = new Date(current_date); this.add_days(next_date, 1); + if (next_date.getTime() > today_time) break; + if (next_date.getMonth() - current_date.getMonth()) { month_change = 1; if (this.discrete_domains) { @@ -3235,14 +3242,6 @@ var Heatmap = function (_BaseChart) { return Heatmap; }(BaseChart); -// if ("development" !== 'production') { -// // Enable LiveReload -// document.write( -// '