diff --git a/js/components/EqualizerWindow.jsx b/js/components/EqualizerWindow.jsx index c66247ce..c4e26e31 100644 --- a/js/components/EqualizerWindow.jsx +++ b/js/components/EqualizerWindow.jsx @@ -2,7 +2,7 @@ import React from 'react'; import {connect} from 'react-redux'; import classnames from 'classnames'; -import {BANDS} from '../constants'; +import {BANDS, WINDOWS} from '../constants'; import {setEqBand, setPreamp} from '../actionCreators'; import DraggableWindow from './DraggableWindow.jsx'; @@ -26,7 +26,7 @@ class EqualizerWindow extends React.Component { } handleClick() { - this.props.dispatch({type: 'SET_FOCUSED_WINDOW', window: 'EQUALIZER'}); + this.props.dispatch({type: 'SET_FOCUSED_WINDOW', window: WINDOWS.EQUALIZER}); } setHertzValue(hertz) { @@ -48,7 +48,7 @@ class EqualizerWindow extends React.Component { const className = classnames({ window: true, - selected: this.props.windows.focused === 'EQUALIZER', + selected: this.props.windows.focused === WINDOWS.EQUALIZER, doubled }); return diff --git a/js/components/MainWindow.jsx b/js/components/MainWindow.jsx index 54268925..8fedb7f9 100644 --- a/js/components/MainWindow.jsx +++ b/js/components/MainWindow.jsx @@ -2,6 +2,8 @@ import React from 'react'; import {connect} from 'react-redux'; import classnames from 'classnames'; +import {WINDOWS} from '../constants'; + import ActionButtons from './ActionButtons.jsx'; import Balance from './Balance.jsx'; import Close from './Close.jsx'; @@ -32,7 +34,7 @@ class MainWindow extends React.Component { } handleClick() { - this.props.dispatch({type: 'SET_FOCUSED_WINDOW', window: 'MAIN'}); + this.props.dispatch({type: 'SET_FOCUSED_WINDOW', window: WINDOWS.MAIN}); } render() { @@ -45,7 +47,7 @@ class MainWindow extends React.Component { play: status === 'PLAYING', stop: status === 'STOPPED', pause: status === 'PAUSED', - selected: this.props.windows.focused === 'MAIN', + selected: this.props.windows.focused === WINDOWS.MAIN, loading, doubled, llama, diff --git a/js/constants.js b/js/constants.js index 1b073e10..42b74af4 100644 --- a/js/constants.js +++ b/js/constants.js @@ -10,3 +10,9 @@ export const BANDS = [ 14000, 16000 ]; + +export const WINDOWS = { + MAIN: 'MAIN', + PLAYLIST: 'PLAYLIST', + EQUALIZER: 'EQUALIZER' +}; diff --git a/js/reducers.js b/js/reducers.js index 1c53dbf4..064fd7cb 100644 --- a/js/reducers.js +++ b/js/reducers.js @@ -1,6 +1,6 @@ import {combineReducers} from 'redux'; -import {BANDS} from './constants'; +import {BANDS, WINDOWS} from './constants'; const userInput = (state, action) => { if (!state) { @@ -24,7 +24,7 @@ const userInput = (state, action) => { const windows = (state, action) => { if (!state) { return { - focused: 'MAIN' + focused: WINDOWS.MAIN }; } switch (action.type) {