diff options
Diffstat (limited to 'server/sonar-web/src/main/js/components/charts')
6 files changed, 14 insertions, 27 deletions
diff --git a/server/sonar-web/src/main/js/components/charts/bar-chart.js b/server/sonar-web/src/main/js/components/charts/bar-chart.js index c7444fedcb9..f82a9c7cda2 100644 --- a/server/sonar-web/src/main/js/components/charts/bar-chart.js +++ b/server/sonar-web/src/main/js/components/charts/bar-chart.js @@ -2,7 +2,7 @@ import d3 from 'd3'; import React from 'react'; import { ResizeMixin } from './mixins/resize-mixin'; -import { TooltipsMixin } from './mixins/tooltips-mixin'; +import { TooltipsMixin } from './../mixins/tooltips-mixin'; export const BarChart = React.createClass({ mixins: [ResizeMixin, TooltipsMixin], diff --git a/server/sonar-web/src/main/js/components/charts/bubble-chart.js b/server/sonar-web/src/main/js/components/charts/bubble-chart.js index e388a2baecb..9e3facaa74d 100644 --- a/server/sonar-web/src/main/js/components/charts/bubble-chart.js +++ b/server/sonar-web/src/main/js/components/charts/bubble-chart.js @@ -2,7 +2,7 @@ import d3 from 'd3'; import React from 'react'; import { ResizeMixin } from './mixins/resize-mixin'; -import { TooltipsMixin } from './mixins/tooltips-mixin'; +import { TooltipsMixin } from './../mixins/tooltips-mixin'; export const Bubble = React.createClass({ diff --git a/server/sonar-web/src/main/js/components/charts/line-chart.js b/server/sonar-web/src/main/js/components/charts/line-chart.js index f7c560bd3e1..eeaed5e88a9 100644 --- a/server/sonar-web/src/main/js/components/charts/line-chart.js +++ b/server/sonar-web/src/main/js/components/charts/line-chart.js @@ -2,7 +2,7 @@ import d3 from 'd3'; import React from 'react'; import { ResizeMixin } from './mixins/resize-mixin'; -import { TooltipsMixin } from './mixins/tooltips-mixin'; +import { TooltipsMixin } from './../mixins/tooltips-mixin'; export const LineChart = React.createClass({ @@ -124,14 +124,21 @@ export const LineChart = React.createClass({ let availableWidth = this.state.width - this.props.padding[1] - this.props.padding[3]; let availableHeight = this.state.height - this.props.padding[0] - this.props.padding[2]; - let maxY = d3.max(this.props.data, d => d.y); + let maxY; let xScale = d3.scale.linear() .domain(d3.extent(this.props.data, d => d.x)) .range([0, availableWidth]); let yScale = d3.scale.linear() - .domain([0, maxY]) .range([availableHeight, 0]); + if (this.props.domain) { + maxY = this.props.domain[1]; + yScale.domain(this.props.domain); + } else { + maxY = d3.max(this.props.data, d => d.y); + yScale.domain([0, maxY]); + } + return <svg className="line-chart" width={this.state.width} height={this.state.height}> <g transform={`translate(${this.props.padding[3]}, ${this.props.padding[0]})`}> {this.renderVerticalGrid(xScale, yScale, maxY)} diff --git a/server/sonar-web/src/main/js/components/charts/mixins/tooltips-mixin.js b/server/sonar-web/src/main/js/components/charts/mixins/tooltips-mixin.js deleted file mode 100644 index 240edee02c5..00000000000 --- a/server/sonar-web/src/main/js/components/charts/mixins/tooltips-mixin.js +++ /dev/null @@ -1,20 +0,0 @@ -import $ from 'jquery'; -import React from 'react'; -import ReactDOM from 'react-dom'; - -export const TooltipsMixin = { - componentDidMount () { - this.initTooltips(); - }, - - componentDidUpdate () { - this.initTooltips(); - }, - - initTooltips () { - if ($.fn.tooltip) { - $('[data-toggle="tooltip"]', ReactDOM.findDOMNode(this)) - .tooltip({ container: 'body', placement: 'bottom', html: true }); - } - } -}; diff --git a/server/sonar-web/src/main/js/components/charts/treemap.js b/server/sonar-web/src/main/js/components/charts/treemap.js index be054fdc055..24bcff49ce2 100644 --- a/server/sonar-web/src/main/js/components/charts/treemap.js +++ b/server/sonar-web/src/main/js/components/charts/treemap.js @@ -3,7 +3,7 @@ import d3 from 'd3'; import React from 'react'; import { ResizeMixin } from './mixins/resize-mixin'; -import { TooltipsMixin } from './mixins/tooltips-mixin'; +import { TooltipsMixin } from './../mixins/tooltips-mixin'; const SIZE_SCALE = d3.scale.linear() diff --git a/server/sonar-web/src/main/js/components/charts/word-cloud.js b/server/sonar-web/src/main/js/components/charts/word-cloud.js index ed59b040fbf..1edbc2274ec 100644 --- a/server/sonar-web/src/main/js/components/charts/word-cloud.js +++ b/server/sonar-web/src/main/js/components/charts/word-cloud.js @@ -2,7 +2,7 @@ import _ from 'underscore'; import d3 from 'd3'; import React from 'react'; -import { TooltipsMixin } from './mixins/tooltips-mixin'; +import { TooltipsMixin } from './../mixins/tooltips-mixin'; export const Word = React.createClass({ propTypes: { |