From 3dc8c0b58f1d35140976639dd239d49df2daeb0b Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Mon, 9 Jan 2017 21:32:15 -0800 Subject: [PATCH] Remove last string constants --- js/components/EqualizerWindow.jsx | 6 +++++- js/components/MainWindow.jsx | 6 +++++- js/components/Marquee.jsx | 5 +++-- js/components/Shade.jsx | 4 +++- js/components/ShadeTime.jsx | 4 ++-- js/components/Time.jsx | 5 +++-- js/winamp.js | 2 +- 7 files changed, 22 insertions(+), 10 deletions(-) diff --git a/js/components/EqualizerWindow.jsx b/js/components/EqualizerWindow.jsx index 9cda7042..de0a21b0 100644 --- a/js/components/EqualizerWindow.jsx +++ b/js/components/EqualizerWindow.jsx @@ -11,6 +11,10 @@ import { setEqToMin } from '../actionCreators'; +import { + SET_FOCUSED_WINDOW +} from '../actionTypes'; + import Band from './Band.jsx'; import EqOn from './EqOn.jsx'; import EqAuto from './EqAuto.jsx'; @@ -82,7 +86,7 @@ class EqualizerWindow extends React.Component { } const mapDispatchToProps = (dispatch) => ({ - focusWindow: () => dispatch({type: 'SET_FOCUSED_WINDOW', window: WINDOWS.EQUALIZER}), + focusWindow: () => dispatch({type: SET_FOCUSED_WINDOW, window: WINDOWS.EQUALIZER}), setPreampValue: (mediaPlayer) => (e) => dispatch(setPreamp(mediaPlayer, e.target.value)), setEqToMin: (mediaPlayer) => () => dispatch(setEqToMin(mediaPlayer)), setEqToMid: (mediaPlayer) => () => dispatch(setEqToMid(mediaPlayer)), diff --git a/js/components/MainWindow.jsx b/js/components/MainWindow.jsx index 24c3cc91..e745d118 100644 --- a/js/components/MainWindow.jsx +++ b/js/components/MainWindow.jsx @@ -25,6 +25,10 @@ import Time from './Time.jsx'; import Visualizer from './Visualizer.jsx'; import Volume from './Volume.jsx'; +import { + SET_FOCUSED_WINDOW +} from '../actionTypes'; + import '../../css/main-window.css'; export class MainWindow extends React.Component { @@ -35,7 +39,7 @@ export class MainWindow extends React.Component { } handleClick() { - this.props.dispatch({type: 'SET_FOCUSED_WINDOW', window: WINDOWS.MAIN}); + this.props.dispatch({type: SET_FOCUSED_WINDOW, window: WINDOWS.MAIN}); } supress(e) { diff --git a/js/components/Marquee.jsx b/js/components/Marquee.jsx index 2556650f..9850df0c 100644 --- a/js/components/Marquee.jsx +++ b/js/components/Marquee.jsx @@ -1,9 +1,10 @@ // Single line text display that can animate and hold multiple registers import React from 'react'; import {connect} from 'react-redux'; - import {getTimeStr} from '../utils'; +import {STEP_MARQUEE} from '../actionTypes'; + const getBalanceText = (balance) => { if (balance === 0) { return 'Balance: Center'; @@ -54,7 +55,7 @@ class Marquee extends React.Component { const step = () => { setTimeout(() => { if (this.state.stepping) { - this.props.dispatch({type: 'STEP_MARQUEE'}); + this.props.dispatch({type: STEP_MARQUEE}); } step(); }, 220); diff --git a/js/components/Shade.jsx b/js/components/Shade.jsx index 626d5301..125f538f 100644 --- a/js/components/Shade.jsx +++ b/js/components/Shade.jsx @@ -1,13 +1,15 @@ import React from 'react'; import {connect} from 'react-redux'; +import {TOGGLE_SHADE_MODE} from '../actionTypes'; + class Shade extends React.Component { constructor(props) { super(props); this.handleClick = this.handleClick.bind(this); } handleClick() { - this.props.dispatch({type: 'TOGGLE_SHADE_MODE'}); + this.props.dispatch({type: TOGGLE_SHADE_MODE}); } render() { return
{ const seconds = timeMode === 'ELAPSED' ? timeElapsed : @@ -20,7 +21,7 @@ const Time = ({timeElapsed, length, timeMode, toggleTimeMode}) => { const mapStateToProps = (state) => state.media; const mapDispatchToProps = (dispatch) => ({ - toggleTimeMode: () => dispatch({type: 'TOGGLE_TIME_MODE'}) + toggleTimeMode: () => dispatch({type: TOGGLE_TIME_MODE}) }); module.exports = connect(mapStateToProps, mapDispatchToProps)(Time); diff --git a/js/winamp.js b/js/winamp.js index 751f86d2..afe3d79c 100755 --- a/js/winamp.js +++ b/js/winamp.js @@ -9,7 +9,7 @@ import { setBalance } from './actionCreators'; -import {SET_MEDIA} from '../actionTypes'; +import {SET_MEDIA} from './actionTypes'; import '../css/winamp.css';