Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-11 16:53:02 +00:00
Code Issues Projects Releases Wiki Activity

Use ship rather than ship ID

Browse Source
This commit is contained in:
Cmdr McDonald
2016-12-16 21:09:11 +00:00
parent 059c2badf4
commit 32282141cf
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/components/DamageDealt.jsx
View File

@@ -124,7 +124,7 @@ export default class DamageDealt extends TranslatedComponent {
return ( return (
<span> <span>
<h1>{translate('damage dealt against')}</h1> <h1>{translate('damage dealt against')}</h1>
<ShipSelector currentMenu={this.props.currentMenu} onChange={this._onShipChange} /> <ShipSelector initial={this.state.against} currentMenu={this.props.currentMenu} onChange={this._onShipChange} />
<table style={{ width: '100%' }}> <table style={{ width: '100%' }}>
<thead> <thead>
<tr className='main'> <tr className='main'>

9
src/app/components/ShipSelector.jsx
View File

@@ -9,6 +9,7 @@ import { Rocket } from './SvgIcons';
*/ */
export default class ShipSelector extends TranslatedComponent { export default class ShipSelector extends TranslatedComponent {
static PropTypes = { static PropTypes = {
initial: React.PropTypes.object.isRequired,
onChange: React.PropTypes.func.isRequired onChange: React.PropTypes.func.isRequired
}; };
@@ -19,7 +20,7 @@ export default class ShipSelector extends TranslatedComponent {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { shipId : 'adder' }; this.state = { ship : this.props.initial };
} }
/** /**
@@ -58,7 +59,7 @@ export default class ShipSelector extends TranslatedComponent {
* @param {string} s The selected ship ID * @param {string} s The selected ship ID
*/ */
_selectShip(s) { _selectShip(s) {
this.setState({ shipId: s }); this.setState({ ship: Ships[s] });
this.context.openMenu(null); this.context.openMenu(null);
this.props.onChange(s); this.props.onChange(s);
@@ -70,13 +71,13 @@ export default class ShipSelector extends TranslatedComponent {
*/ */
render() { render() {
const currentMenu = this.props.currentMenu; const currentMenu = this.props.currentMenu;
const shipId = this.state.shipId; const ship = this.state.ship;
return ( return (
<div className='shipselector'> <div className='shipselector'>
<div className='menu'> <div className='menu'>
<div className={cn('menu-header', { selected: currentMenu == 'wds' })} onClick={this._openMenu.bind(this, 'wds')}> <div className={cn('menu-header', { selected: currentMenu == 'wds' })} onClick={this._openMenu.bind(this, 'wds')}>
<Rocket className='warning' /><span className='menu-item-label'>{Ships[shipId].properties.name}</span> <Rocket className='warning' /><span className='menu-item-label'>{ship.properties.name}</span>
{currentMenu == 'wds' ? {currentMenu == 'wds' ?
<div className='menu-list quad no-wrap' onClick={ (e) => e.stopPropagation() }> <div className='menu-list quad no-wrap' onClick={ (e) => e.stopPropagation() }>
{this._getShipsMenu()} {this._getShipsMenu()}