From d0faa63cf8d94fc40553620014b0ccf8a1e00468 Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Mon, 9 Jan 2017 21:21:25 -0800 Subject: [PATCH] Use constants rather than strings in a few more places --- js/actionCreators.js | 7 ++++--- js/components/ClutterBar.jsx | 8 +++++--- js/components/ContextMenu.jsx | 8 +++++--- js/components/EqAuto.jsx | 4 +++- js/components/EqOn.jsx | 4 +++- js/components/EqToggleButton.jsx | 3 ++- 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/js/actionCreators.js b/js/actionCreators.js index e7c5b19d..b00c844d 100644 --- a/js/actionCreators.js +++ b/js/actionCreators.js @@ -11,7 +11,8 @@ import { SET_VOLUME, START_LOADING, TOGGLE_REPEAT, - TOGGLE_SHUFFLE + TOGGLE_SHUFFLE, + STOP } from './actionTypes'; export function play() { @@ -29,12 +30,12 @@ export function pause() { } export function stop() { - return {type: 'STOP'}; + return {type: STOP}; } export function close() { return (dispatch) => { - dispatch({type: 'STOP'}); + dispatch({type: STOP}); dispatch({type: CLOSE_WINAMP}); }; } diff --git a/js/components/ClutterBar.jsx b/js/components/ClutterBar.jsx index 7d61463e..9bf19721 100644 --- a/js/components/ClutterBar.jsx +++ b/js/components/ClutterBar.jsx @@ -2,6 +2,8 @@ import React from 'react'; import {connect} from 'react-redux'; import classnames from 'classnames'; +import {SET_FOCUS, TOGGLE_DOUBLESIZE_MODE, UNSET_FOCUS} from '../actionTypes'; + const ClutterBar = (props) => (
@@ -23,10 +25,10 @@ const mapStateToProps = (state) => ({ }); const mapDispatchToProps = (dispatch) => ({ - handleMouseDown: () => dispatch({type: 'SET_FOCUS', input: 'double'}), + handleMouseDown: () => dispatch({type: SET_FOCUS, input: 'double'}), handleMouseUp: () => { - dispatch({type: 'TOGGLE_DOUBLESIZE_MODE'}); - dispatch({type: 'UNSET_FOCUS'}); + dispatch({type: TOGGLE_DOUBLESIZE_MODE}); + dispatch({type: UNSET_FOCUS}); } }); diff --git a/js/components/ContextMenu.jsx b/js/components/ContextMenu.jsx index 0a9272c9..18c808a4 100644 --- a/js/components/ContextMenu.jsx +++ b/js/components/ContextMenu.jsx @@ -4,6 +4,8 @@ import classnames from 'classnames'; import {close, setSkinFromFilename, openFileDialog} from '../actionCreators'; +import {CLOSE_CONTEXT_MENU, TOGGLE_CONTEXT_MENU} from '../actionTypes'; + import '../../css/context-menu.css'; const SKINS = [ @@ -55,10 +57,10 @@ class ContextMenu extends React.Component { const mapStateToProps = (state) => state.contextMenu; const mapDispatchToProps = (dispatch, ownProps) => ({ - close: () => dispatch(close(ownProps.mediaPlayer)), - closeMenu: () => dispatch({type: 'CLOSE_CONTEXT_MENU'}), + close: () => dispatch(close()), + closeMenu: () => dispatch({type: CLOSE_CONTEXT_MENU}), toggleMenu: (e) => { - dispatch({type: 'TOGGLE_CONTEXT_MENU'}); + dispatch({type: TOGGLE_CONTEXT_MENU}); e.stopPropagation(); }, openFileDialog: () => openFileDialog(ownProps.winamp), diff --git a/js/components/EqAuto.jsx b/js/components/EqAuto.jsx index bcf6fbfa..8334969c 100644 --- a/js/components/EqAuto.jsx +++ b/js/components/EqAuto.jsx @@ -2,6 +2,8 @@ import React from 'react'; import {connect} from 'react-redux'; import classnames from 'classnames'; +import {TOGGLE_EQ_AUTO} from '../actionTypes'; + class EqAuto extends React.Component { constructor(props) { super(props); @@ -9,7 +11,7 @@ class EqAuto extends React.Component { } handleClick() { - this.props.dispatch({type: 'TOGGLE_EQ_AUTO'}); + this.props.dispatch({type: TOGGLE_EQ_AUTO}); } render() { diff --git a/js/components/EqOn.jsx b/js/components/EqOn.jsx index b3c68383..77cba08f 100644 --- a/js/components/EqOn.jsx +++ b/js/components/EqOn.jsx @@ -2,6 +2,8 @@ import React from 'react'; import {connect} from 'react-redux'; import classnames from 'classnames'; +import {TOGGLE_EQ_ON} from '../actionTypes'; + class EqOn extends React.Component { constructor(props) { super(props); @@ -9,7 +11,7 @@ class EqOn extends React.Component { } handleClick() { - this.props.dispatch({type: 'TOGGLE_EQ_ON'}); + this.props.dispatch({type: TOGGLE_EQ_ON}); } render() { diff --git a/js/components/EqToggleButton.jsx b/js/components/EqToggleButton.jsx index 1a6a22fd..90aba899 100644 --- a/js/components/EqToggleButton.jsx +++ b/js/components/EqToggleButton.jsx @@ -2,6 +2,7 @@ import React from 'react'; import {connect} from 'react-redux'; import classnames from 'classnames'; +import {TOGGLE_EQUALIZER_WINDOW} from '../actionTypes'; const EqToggleButton = (props) => (
({ }); const mapDispatchToProps = (dispatch) => ({ - handleClick: () => dispatch({type: 'TOGGLE_EQUALIZER_WINDOW'}) + handleClick: () => dispatch({type: TOGGLE_EQUALIZER_WINDOW}) });