machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into simon/angular-universal

Browse Source 
* master:
  Add the Commons Clause License Condition v1.0 to our MIT License
  fix legend bug on resize
  Correcting new chartist import path.
  Flip mempool chart by using patched chartist package by @techmix

# Conflicts:
#	frontend/package-lock.json
This commit is contained in:
softsimon
2020-11-15 02:51:00 +07:00
parent ea04dfa62f 1e39daafb3
commit f8ffd6ec6b
8 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/app/components/statistics/chartist.component.ts
View File

@@ -9,7 +9,7 @@ import {
ViewEncapsulation
} from '@angular/core';
import * as Chartist from 'chartist';
import * as Chartist from '@mempool/chartist';
/**
* Possible chart types
@@ -319,7 +319,11 @@ Chartist.plugins.legend = function (options: any) {
chart.on('created', function (data: any) {
if (isSelfUpdate)
const useLabels = chart instanceof Chartist.Pie && chart.data.labels && chart.data.labels.length;
const legendNames = getLegendNames(useLabels);
var dirtyChartData = (chart.data.series.length < legendNames.length);
if (isSelfUpdate || dirtyChartData)
return;
function removeLegendElement() {
@@ -476,8 +480,6 @@ Chartist.plugins.legend = function (options: any) {
removeLegendElement();
const legendElement = createLegendElement();
const useLabels = chart instanceof Chartist.Pie && chart.data.labels && chart.data.labels.length;
const legendNames = getLegendNames(useLabels);
const seriesMetadata = initSeriesMetadata(useLabels);
const legends: any = [];