Fix linting errors from merging on github
parent
f3237f8d88
commit
f0f2e1d894
|
@ -161,7 +161,6 @@ export const annotationStyle = (
|
||||||
isDragging,
|
isDragging,
|
||||||
staticLegendHeight
|
staticLegendHeight
|
||||||
) => {
|
) => {
|
||||||
export const annotationStyle = ({time}, dygraph, isMouseOver, isDragging) => {
|
|
||||||
// TODO: export and test this function
|
// TODO: export and test this function
|
||||||
const [startX, endX] = dygraph.xAxisRange()
|
const [startX, endX] = dygraph.xAxisRange()
|
||||||
let visibility = 'visible'
|
let visibility = 'visible'
|
||||||
|
@ -240,7 +239,7 @@ export const annotationWindowStyle = (
|
||||||
position: 'absolute',
|
position: 'absolute',
|
||||||
top: '8px',
|
top: '8px',
|
||||||
background: `linear-gradient(to bottom, ${gradientStartColor} 0%,${gradientEndColor} 100%)`,
|
background: `linear-gradient(to bottom, ${gradientStartColor} 0%,${gradientEndColor} 100%)`,
|
||||||
height: 'calc(100% - 36px)',
|
height,
|
||||||
borderTop: `2px dotted rgba(${annotationColor},0.35)`,
|
borderTop: `2px dotted rgba(${annotationColor},0.35)`,
|
||||||
width,
|
width,
|
||||||
zIndex: zIndexWindow,
|
zIndex: zIndexWindow,
|
||||||
|
|
|
@ -25,7 +25,6 @@ import {
|
||||||
highlightSeriesOpts,
|
highlightSeriesOpts,
|
||||||
} from 'src/shared/graphs/helpers'
|
} from 'src/shared/graphs/helpers'
|
||||||
const {LINEAR, LOG, BASE_10, BASE_2} = DISPLAY_OPTIONS
|
const {LINEAR, LOG, BASE_10, BASE_2} = DISPLAY_OPTIONS
|
||||||
import {ADDING, EDITING} from 'src/shared/annotations/helpers'
|
|
||||||
|
|
||||||
class Dygraph extends Component {
|
class Dygraph extends Component {
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
|
@ -304,8 +303,7 @@ class Dygraph extends Component {
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const {isHidden, staticLegendHeight} = this.state
|
const {isHidden, staticLegendHeight} = this.state
|
||||||
const {staticLegend,mode} = this.props
|
const {staticLegend} = this.props
|
||||||
const hideLegend = mode === EDITING || mode === ADDING ? true : isHidden
|
|
||||||
|
|
||||||
let dygraphStyle = {...this.props.containerStyle, zIndex: '2'}
|
let dygraphStyle = {...this.props.containerStyle, zIndex: '2'}
|
||||||
if (staticLegend) {
|
if (staticLegend) {
|
||||||
|
|
|
@ -172,7 +172,7 @@ class NewAnnotation extends Component {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const {bool, func, number, shape} = P
|
const {bool, func, number, shape} = PropTypes
|
||||||
|
|
||||||
NewAnnotation.propTypes = {
|
NewAnnotation.propTypes = {
|
||||||
dygraph: shape({}).isRequired,
|
dygraph: shape({}).isRequired,
|
||||||
|
|
Loading…
Reference in New Issue