From a66ef24fb90e3ac347a81312582367c225f22ae5 Mon Sep 17 00:00:00 2001 From: catarak Date: Wed, 22 Jun 2016 17:49:29 -0400 Subject: [PATCH] rename preferences state --- client/modules/IDE/components/Preferences.jsx | 2 +- client/modules/IDE/components/Toolbar.jsx | 2 +- client/modules/IDE/pages/IDEView.jsx | 5 ++--- client/modules/IDE/reducers/preferences.js | 10 +++++----- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/client/modules/IDE/components/Preferences.jsx b/client/modules/IDE/components/Preferences.jsx index 4e8b2300..0233e6ac 100644 --- a/client/modules/IDE/components/Preferences.jsx +++ b/client/modules/IDE/components/Preferences.jsx @@ -10,7 +10,7 @@ class Preferences extends React.Component { render() { let preferencesContainerClass = classNames({ "preferences": true, - "preferences--selected": this.props.isPreferencesShowing + "preferences--selected": this.props.isVisible }); return (
diff --git a/client/modules/IDE/components/Toolbar.jsx b/client/modules/IDE/components/Toolbar.jsx index 1e838ca5..590f8015 100644 --- a/client/modules/IDE/components/Toolbar.jsx +++ b/client/modules/IDE/components/Toolbar.jsx @@ -19,7 +19,7 @@ class Toolbar extends React.Component { }); let preferencesButtonClass = classNames({ "toolbar__preferences-button": true, - "toolbar__preferences-button--selected": this.props.isPreferencesShowing + "toolbar__preferences-button--selected": this.props.isPreferencesVisible }); return ( diff --git a/client/modules/IDE/pages/IDEView.jsx b/client/modules/IDE/pages/IDEView.jsx index 8f0d139a..b71d2c2d 100644 --- a/client/modules/IDE/pages/IDEView.jsx +++ b/client/modules/IDE/pages/IDEView.jsx @@ -33,10 +33,9 @@ class IDEView extends React.Component { projectName={this.props.project.name} setProjectName={this.props.setProjectName} openPreferences={this.props.openPreferences} - isPreferencesShowing = {this.props.preferences.isPreferencesShowing} - /> + isPreferencesVisible={this.props.preferences.isVisible}/> { switch (action.type) { case ActionTypes.OPEN_PREFERENCES: return { - isPreferencesShowing: true, + isVisible: true, fontSize: state.fontSize } case ActionTypes.CLOSE_PREFERENCES: return { - isPreferencesShowing: false, + isVisible: false, fontSize: state.fontSize } case ActionTypes.INCREASE_FONTSIZE: return { - isPreferencesShowing: state.isPreferencesShowing, + isVisible: state.isVisible, fontSize: state.fontSize+2 } case ActionTypes.DECREASE_FONTSIZE: return { - isPreferencesShowing: state.isPreferencesShowing, + isVisible: state.isVisible, fontSize: state.fontSize-2 } default: