refactor view to top level

This commit is contained in:
Eric Hulburd
2016-02-15 11:38:41 -06:00
parent 6713e756c4
commit 1758fce5a4
12 changed files with 217 additions and 100 deletions

2
client/d3/base.js vendored
View File

@@ -31,7 +31,7 @@ class Chart {
constructor(options){
var chart = this;
chart = extend(chart, chart.chart_options, options);
chart = extend(chart, chart.chart_options, options);
chart.height = chart.outer_height - chart.margin.top - chart.margin.bottom;
chart.width = chart.outer_width - chart.margin.left - chart.margin.right;

View File

@@ -10,7 +10,7 @@ const DEFAULTS = {
time_series: true,
range_label: "range",
domain_attr: null,
range_attr:
range_attr: 'y',
titleize: function(series, datum){
var s = datum ? datum.name : series.name,
words = s.split(' '),
@@ -75,8 +75,8 @@ class LineChart {
.orient("left");
if (line_chart.time_series){
line_chart.x_scale = d3.time.scale(),
.range([0, line_chart.width]););
line_chart.x_scale = d3.time.scale()
.range([0, line_chart.width]);
} else {
line_chart.x_scale = d3.scale.linear()
.range([0, line_chart.width]);
@@ -147,7 +147,7 @@ class LineChart {
applyData(groups){
var line_chart = this;
groups
.attr('class', function(series){ return "d3-chart-line " + series.css_class; )
.attr('class', function(series){ return "d3-chart-line " + series.css_class; })
.attr("title", function(series){ return series.title; })
.append("path")
.attr("d", function(series){ return line_chart.line(series.values); })