fixing conflicts in column chart and dispatch

This commit is contained in:
Shelby Sturgis 2014-09-22 16:59:07 +03:00
parent da0007388d
commit e51032bedf
2 changed files with 4 additions and 1 deletions

View file

@ -445,6 +445,8 @@
- Change index to be the resolved in some way, last three months, last hour, last year, whatever
- **[src/kibana/components/vis_types/converters/pie.js](https://github.com/elasticsearch/kibana4/blob/master/src/kibana/components/vis_types/converters/pie.js)**
- cleanup code, simplify and document
- **[src/kibana/components/vislib/lib/dispatch.js](https://github.com/elasticsearch/kibana4/blob/master/src/kibana/components/vislib/lib/dispatch.js)**
- Replace the following code with something more robust for finding the field
- **[src/kibana/components/vislib/vis.js](https://github.com/elasticsearch/kibana4/blob/master/src/kibana/components/vislib/vis.js)**
- need to come up with a solution for resizing when no data is available
- **[src/kibana/components/vislib/visualizations/column_chart.js](https://github.com/elasticsearch/kibana4/blob/master/src/kibana/components/vislib/visualizations/column_chart.js)**
@ -460,4 +462,4 @@
- **[test/unit/specs/directives/typeahead.js](https://github.com/elasticsearch/kibana4/blob/master/test/unit/specs/directives/typeahead.js)**
- This should not be needed, timefilter is only included here, it should move
- **[test/unit/specs/vislib/vis.js](https://github.com/elasticsearch/kibana4/blob/master/test/unit/specs/vislib/vis.js)**
- fix this test instead of just skipping it
- fix this test instead of just skipping it

View file

@ -11,6 +11,7 @@ define(function (require) {
}
var type = vis._attr.type;
this.vis = vis;
this.chartData = chartData;
this.color = type === 'pie' ? vis.data.getPieColorFunc() : vis.data.getColorFunc();
this._attr = _.defaults(vis._attr || {}, {