feat: remove close button in CCG input settings window

olzzon · Jan 27, 2020 · d61dab7 · d61dab7
1 parent 7d20317
commit d61dab7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/client/components/CcgChannelSettings.tsx b/client/components/CcgChannelSettings.tsx
@@ -17,7 +17,7 @@ interface IChannelProps {
 	channelIndex: number
 }
 
-class CcgChannelSettings extends React.PureComponent<IChannelProps & IChannelSettingsInjectProps & Store> {
+class CcgChannelInputSettings extends React.PureComponent<IChannelProps & IChannelSettingsInjectProps & Store> {
     mixerProtocol: ICasparCGMixerGeometry | undefined;
     channelIndex: number;
 
@@ -36,21 +36,13 @@ class CcgChannelSettings extends React.PureComponent<IChannelProps & IChannelSet
 			channel: this.channelIndex,
 			prop,
 			option
-		});
-	}
-
-	handleClose = () => {
-		this.props.dispatch({
-			type: TOGGLE_SHOW_OPTION,
-			channel: this.channelIndex
-		});
+		})
 	}
 
     render() {
         return (
 			<div className="channel-settings-body">
 				<h2>{this.props.label || ("CH " + (this.channelIndex + 1))}</h2>
-				<button className="close" onClick={() => this.handleClose()}>X</button>
 				{this.mixerProtocol &&
 					this.mixerProtocol.sourceOptions &&
 					Object.getOwnPropertyNames(this.mixerProtocol.sourceOptions.options).map(prop => {
@@ -82,4 +74,4 @@ const mapStateToProps = (state: any, props: any): IChannelSettingsInjectProps =>
     }
 }
 
-export default connect<any, IChannelSettingsInjectProps>(mapStateToProps)(CcgChannelSettings) as any;
+export default connect<any, IChannelSettingsInjectProps>(mapStateToProps)(CcgChannelInputSettings) as any;
diff --git a/client/components/ChanStrip.tsx b/client/components/ChanStrip.tsx
@@ -11,7 +11,7 @@ import {
  } from '../../server/reducers/settingsActions'
 import { IFader } from '../../server/reducers/fadersReducer'
 import { SOCKET_SET_THRESHOLD, SOCKET_SET_RATIO, SOCKET_SET_LOW, SOCKET_SET_LO_MID, SOCKET_SET_MID, SOCKET_SET_HIGH, SOCKET_SET_AUX_LEVEL } from '../../server/constants/SOCKET_IO_DISPATCHERS';
-import CcgChannelSettings from './CcgChannelSettings';
+import CcgChannelInputSettings from './CcgChannelSettings';
 
 interface IChanStripInjectProps {
     label: string,
@@ -281,7 +281,7 @@ class ChanStrip extends React.PureComponent<IChanStripProps & IChanStripInjectPr
     parameters() {
         if (this.props.selectedProtocol.includes("caspar")) {
             return (
-                <CcgChannelSettings channelIndex={this.props.faderIndex} />
+                <CcgChannelInputSettings channelIndex={this.props.faderIndex} />
             )
         }
         else {

diff --git a/client/components/ChannelRouteSettings.tsx b/client/components/ChannelRouteSettings.tsx
@@ -5,8 +5,6 @@ import * as ClassNames from 'classnames';
 import '../assets/css/ChannelRouteSettings.css';
 import { Store } from 'redux';
 import { connect } from 'react-redux';
-import CcgChannelSettings from './CcgChannelSettings';
-import { SET_ASSIGNED_FADER } from '../../server/reducers/channelActions'
 import { TOGGLE_SHOW_OPTION } from '../../server/reducers/settingsActions'
 import { SOCKET_SET_ASSIGNED_FADER } from '../../server/constants/SOCKET_IO_DISPATCHERS';