Removed some unused code, and cleaned up some ternary operations.

master
Håvar Aambø Fosstveit 2018-12-20 11:02:32 +01:00
parent 580b3b88e3
commit ea85041d78
7 changed files with 8 additions and 69 deletions

View File

@ -23,7 +23,6 @@ class Chat extends Component
const {
roomClient,
senderPlaceHolder,
disabledInput,
autofocus,
displayName,
picture
@ -53,7 +52,6 @@ class Chat extends Component
className='new-message'
name='message'
placeholder={senderPlaceHolder}
disabled={disabledInput}
autoFocus={autofocus}
autoComplete='off'
/>
@ -72,7 +70,6 @@ Chat.propTypes =
{
roomClient : PropTypes.any.isRequired,
senderPlaceHolder : PropTypes.string,
disabledInput : PropTypes.bool,
autofocus : PropTypes.bool,
displayName : PropTypes.string,
picture : PropTypes.string
@ -88,9 +85,8 @@ Chat.defaultProps =
const mapStateToProps = (state) =>
{
return {
disabledInput : state.chatbehavior.disabledInput,
displayName : state.me.displayName,
picture : state.me.picture
displayName : state.me.displayName,
picture : state.me.picture
};
};

View File

@ -16,9 +16,9 @@ const ListMe = ({ me }) =>
</div>
<div className='indicators'>
{me.raisedHand && (
<If condition={me.raisedHand}>
<div className='icon raise-hand on' />
)}
</If>
</div>
</div>
</li>

View File

@ -13,9 +13,9 @@ const TabHeader = ({ currentToolTab, setToolTab, id, name, badge }) => (
>
{name}
{badge > 0 && (
<If condition={badge > 0}>
<span className='badge'>{badge}</span>
)}
</If>
</div>
);

View File

@ -59,11 +59,11 @@ class ToolArea extends React.Component
/>
<p>Toolbox</p>
</span>
{!toolAreaOpen && unread > 0 && (
<If condition={!toolAreaOpen && unread > 0}>
<span className={classNames('badge', { long: unread >= 10 })}>
{unread}
</span>
)}
</If>
</div>
<div className='tab-headers'>
<TabHeader

View File

@ -1,36 +0,0 @@
const initialState =
{
showChat : false,
disabledInput : false,
badge : 0
};
const chatbehavior = (state = initialState, action) =>
{
switch (action.type)
{
case 'TOGGLE_CHAT':
{
const showChat = !state.showChat;
const badge = 0;
return { ...state, showChat, badge };
}
case 'TOGGLE_INPUT_DISABLED':
{
const disabledInput = !state.disabledInput;
return { ...state, disabledInput };
}
case 'INCREASE_BADGE':
{
return { ...state, badge: state.badge + (state.showChat ? 0 : 1) };
}
default:
return state;
}
};
export default chatbehavior;

View File

@ -6,7 +6,6 @@ import peers from './peers';
import consumers from './consumers';
import notifications from './notifications';
import chatmessages from './chatmessages';
import chatbehavior from './chatbehavior';
import toolarea from './toolarea';
import files from './files';
@ -19,7 +18,6 @@ const reducers = combineReducers(
consumers,
notifications,
chatmessages,
chatbehavior,
toolarea,
files
});

View File

@ -1,19 +0,0 @@
const sharing = (state = [], action) =>
{
switch (action.type)
{
case 'SEND_FILE':
return [ ...state, { ...action.payload, me: true } ];
case 'ADD_FILE':
return [ ...state, action.payload ];
case 'ADD_FILE_HISTORY':
return [ ...action.payload.fileHistory, ...state ];
default:
return state;
}
};
export default sharing;