diff --git a/src/app/components/Announcement.jsx b/src/app/components/Announcement.jsx index 1c2df735..baa72ad5 100644 --- a/src/app/components/Announcement.jsx +++ b/src/app/components/Announcement.jsx @@ -6,7 +6,6 @@ import { autoBind } from 'react-extras'; * Announcement component */ export default class Announcement extends React.Component { - static propTypes = { text: PropTypes.string }; @@ -27,5 +26,4 @@ export default class Announcement extends React.Component { render() { return
{this.props.text}
; } - } diff --git a/src/app/components/Header.jsx b/src/app/components/Header.jsx index 37456526..ebb07f38 100644 --- a/src/app/components/Header.jsx +++ b/src/app/components/Header.jsx @@ -56,12 +56,11 @@ function selectAll(e) { * Coriolis App Header section / menus */ export default class Header extends TranslatedComponent { - - /** - * Constructor - * @param {Object} props React Component properties - * @param {Object} context React Component context - */ + /** + * Constructor + * @param {Object} props React Component properties + * @param {Object} context React Component context + */ constructor(props, context) { super(props); this.shipOrder = Object.keys(Ships).sort(); @@ -509,7 +508,7 @@ export default class Header extends TranslatedComponent { A - {translate('reset')} + {translate('reset')} @@ -608,7 +607,7 @@ export default class Header extends TranslatedComponent {
-
+
{translate('announcements')}
{openedMenu == 'announce' ? this._getAnnouncementsMenu() : null} @@ -639,5 +638,4 @@ export default class Header extends TranslatedComponent { ); } - } diff --git a/src/app/components/LineChart.jsx b/src/app/components/LineChart.jsx index b4113ee6..f9655554 100644 --- a/src/app/components/LineChart.jsx +++ b/src/app/components/LineChart.jsx @@ -10,7 +10,6 @@ const MARGIN = { top: 15, right: 20, bottom: 35, left: 60 }; * Line Chart */ export default class LineChart extends TranslatedComponent { - static defaultProps = { code: '', xMin: 0, diff --git a/src/app/components/Link.jsx b/src/app/components/Link.jsx index cf956016..f7a1b06a 100644 --- a/src/app/components/Link.jsx +++ b/src/app/components/Link.jsx @@ -7,7 +7,6 @@ import { shallowEqual } from '../utils/UtilityFunctions'; * Link wrapper component */ export default class Link extends React.Component { - static propTypes = { children: PropTypes.any, href: PropTypes.string.isRequired, @@ -56,5 +55,4 @@ export default class Link extends React.Component { render() { return {this.props.children}; } - } diff --git a/src/app/components/ModalBatchOrbis.jsx b/src/app/components/ModalBatchOrbis.jsx index 3e1c9ad5..c2eccf95 100644 --- a/src/app/components/ModalBatchOrbis.jsx +++ b/src/app/components/ModalBatchOrbis.jsx @@ -9,7 +9,6 @@ import Persist from '../stores/Persist'; * Permalink modal */ export default class ModalBatchOrbis extends TranslatedComponent { - static propTypes = { ships: PropTypes.any.isRequired }; diff --git a/src/app/components/ModalCompare.jsx b/src/app/components/ModalCompare.jsx index 5639d53f..afa03c3a 100644 --- a/src/app/components/ModalCompare.jsx +++ b/src/app/components/ModalCompare.jsx @@ -21,7 +21,6 @@ function buildComparator(a, b) { * Compare builds modal */ export default class ModalCompare extends TranslatedComponent { - static propTypes = { onSelect: PropTypes.func.isRequired, builds: PropTypes.array @@ -105,8 +104,8 @@ export default class ModalCompare extends TranslatedComponent { let selectedBuilds = usedBuilds.map((build, i) => - {build.name}< - td className='tl'>{build.buildName} + {build.name} + {build.buildName} ); diff --git a/src/app/components/ModalExport.jsx b/src/app/components/ModalExport.jsx index fac9725d..ead3b78b 100644 --- a/src/app/components/ModalExport.jsx +++ b/src/app/components/ModalExport.jsx @@ -6,7 +6,6 @@ import TranslatedComponent from './TranslatedComponent'; * Export Modal */ export default class ModalExport extends TranslatedComponent { - static propTypes = { title: PropTypes.string, generator: PropTypes.func, diff --git a/src/app/components/ModalHelp.jsx b/src/app/components/ModalHelp.jsx index 7d5b1e1a..156a5348 100644 --- a/src/app/components/ModalHelp.jsx +++ b/src/app/components/ModalHelp.jsx @@ -7,7 +7,6 @@ import TranslatedComponent from './TranslatedComponent'; * Help Modal */ export default class ModalHelp extends TranslatedComponent { - static propTypes = { title: PropTypes.string }; diff --git a/src/app/components/ModalImport.jsx b/src/app/components/ModalImport.jsx index cf48e138..b1a789de 100644 --- a/src/app/components/ModalImport.jsx +++ b/src/app/components/ModalImport.jsx @@ -85,8 +85,6 @@ function detailedJsonToBuild(detailedBuild) { * Import Modal */ export default class ModalImport extends TranslatedComponent { - - static propTypes = { builds: PropTypes.object, // Optional: Import object }; @@ -130,7 +128,7 @@ export default class ModalImport extends TranslatedComponent { if (data && data.Ship && data.Modules) { const deflated = zlib.deflate(JSON.stringify(data), { to: 'string' }); let compressed = btoa(deflated); - this.setState({loadoutEvent: compressed}); + this.setState({ loadoutEvent: compressed }); } else { throw 'Loadout event must contain Ship and Modules'; } @@ -542,7 +540,7 @@ export default class ModalImport extends TranslatedComponent { {comparisonRows} - ); + ); } if(this.state.canEdit) { diff --git a/src/app/components/ModalOrbis.jsx b/src/app/components/ModalOrbis.jsx index 9580fdfb..da9ca09e 100644 --- a/src/app/components/ModalOrbis.jsx +++ b/src/app/components/ModalOrbis.jsx @@ -8,7 +8,6 @@ import Persist from '../stores/Persist'; * Permalink modal */ export default class ModalOrbis extends TranslatedComponent { - static propTypes = { ship: PropTypes.any.isRequired }; @@ -58,14 +57,14 @@ export default class ModalOrbis extends TranslatedComponent { credentials: 'include', mode: 'cors' }) - .then(data => data.json()) - .then(res => { - this.setState({ authenticatedStatus: res.status || res.error }); - }) - .catch(err => { - console.error(err); - this.setState({ authenticatedStatus: err.message }); - }); + .then(data => data.json()) + .then(res => { + this.setState({ authenticatedStatus: res.status || res.error }); + }) + .catch(err => { + console.error(err); + this.setState({ authenticatedStatus: err.message }); + }); } /** @@ -98,7 +97,7 @@ export default class ModalOrbis extends TranslatedComponent { let ship = this.state.ship; let cat = e.target.value; ship.category = cat; - this.setState({ship}); + this.setState({ ship }); } /** diff --git a/src/app/components/ModalPermalink.jsx b/src/app/components/ModalPermalink.jsx index 96d611e6..ca7de8cc 100644 --- a/src/app/components/ModalPermalink.jsx +++ b/src/app/components/ModalPermalink.jsx @@ -7,7 +7,6 @@ import ShortenUrl from '../utils/ShortenUrl'; * Permalink modal */ export default class ModalPermalink extends TranslatedComponent { - static propTypes = { url: PropTypes.string.isRequired }; diff --git a/src/app/components/ModalShoppingList.jsx b/src/app/components/ModalShoppingList.jsx index ee28d9d1..0b92c710 100644 --- a/src/app/components/ModalShoppingList.jsx +++ b/src/app/components/ModalShoppingList.jsx @@ -8,7 +8,6 @@ import Persist from '../stores/Persist'; * Permalink modal */ export default class ModalShoppingList extends TranslatedComponent { - static propTypes = { ship: PropTypes.object.isRequired }; diff --git a/src/app/components/PieChart.jsx b/src/app/components/PieChart.jsx index 1c9ccac8..7a78551f 100644 --- a/src/app/components/PieChart.jsx +++ b/src/app/components/PieChart.jsx @@ -10,7 +10,6 @@ const LABEL_COLOUR = '#000000'; * A pie chart */ export default class PieChart extends Component { - static propTypes = { data : PropTypes.array.isRequired }; diff --git a/src/app/components/PowerManagement.jsx b/src/app/components/PowerManagement.jsx index df2161ea..0b87b647 100644 --- a/src/app/components/PowerManagement.jsx +++ b/src/app/components/PowerManagement.jsx @@ -136,7 +136,7 @@ export default class PowerManagement extends TranslatedComponent { m.setPowerPriority(newPrio); onChange(); } - } + }; } /** diff --git a/src/app/components/ShipPicker.jsx b/src/app/components/ShipPicker.jsx index 432b2130..77231579 100644 --- a/src/app/components/ShipPicker.jsx +++ b/src/app/components/ShipPicker.jsx @@ -114,11 +114,11 @@ export default class ShipPicker extends TranslatedComponent { {shipString}
{ menuOpen ? -
e.stopPropagation() }> -
- {this._renderPickerMenu()} -
-
: null } +
e.stopPropagation() }> +
+ {this._renderPickerMenu()} +
+
: null }
); diff --git a/src/app/components/ShipSummaryTable.jsx b/src/app/components/ShipSummaryTable.jsx index f0ba67cf..f71415a5 100644 --- a/src/app/components/ShipSummaryTable.jsx +++ b/src/app/components/ShipSummaryTable.jsx @@ -80,8 +80,8 @@ export default class ShipSummaryTable extends TranslatedComponent { const canJump = true; return
-
-
+
+
@@ -119,49 +119,49 @@ export default class ShipSummaryTable extends TranslatedComponent { + >{canThrust ? + {int(speed)}{u['m/s']} : + 0 + } + >{canBoost ? + {int(shipBoost)}{u['m/s']} : + 0 + } + {NaN}{u.LY} : + 0 + } + {NaN}{u.LY} : + 0 + } + >{canJump ? + {f2(jumpRangeMetrics.jumpRange)}{u.LY} : + 0 + } + {NaN}{u.LY} : + 0 + } + >{canJump ? + {f2(jumpRangeMetrics.totalRange)}{u.LY} : + 0 + } - - - - - - + + + + + + - - - - - - - - + + + + + + + + @@ -252,7 +252,7 @@ export default class ShipSummaryTable extends TranslatedComponent { - + diff --git a/src/app/components/Slider.jsx b/src/app/components/Slider.jsx index d36ca968..97746515 100644 --- a/src/app/components/Slider.jsx +++ b/src/app/components/Slider.jsx @@ -123,16 +123,16 @@ export default class Slider extends React.Component { /** * Touch start handler * @param {Event} event DOM Event - * + * */ _touchstart(event) { this.touchStartTimer = setTimeout(() => this.sliderInputBox._setDisplay('block'), 1500); } - + /** * Touch end handler * @param {Event} event DOM Event - * + * */ _touchend(event) { this.sliderInputBox.sliderVal.focus(); @@ -212,7 +212,7 @@ export default class Slider extends React.Component { let margin = MARGIN_LR * scale; let width = outerWidth - (margin * 2); let pctPos = width * this.props.percent; - return
this.node = node} tabIndex="0"> @@ -231,7 +231,7 @@ export default class Slider extends React.Component { scale={this.props.scale} max={this.props.max} /> -
; + ; } } /** @@ -269,14 +269,14 @@ class TextInputBox extends React.Component { this.setState({ inputValue: nextValue }); } } - /** + /** * Update slider textbox visibility/values if changes are made to slider * @param {Object} prevProps React Component properites * @param {Object} prevState React Component state values */ componentDidUpdate(prevProps, prevState) { if (prevState.divStyle.display == 'none' && this.state.divStyle.display == 'block') { - this.enterTimer = setTimeout(() => this.sliderVal.focus(), 10); + this.enterTimer = setTimeout(() => this.sliderVal.focus(), 10); } if (prevProps.max !== this.props.max && this.state.inputValue > this.props.max) { // they chose a different module @@ -287,14 +287,14 @@ class TextInputBox extends React.Component { } } /** - * Set initial state for the textbox. - * We may want to rethink this to + * Set initial state for the textbox. + * We may want to rethink this to * try and make it a stateless component * @returns {object} React state object with initial values set */ _getInitialState() { return { - divStyle: { display:'none' }, + divStyle: { display:'none' }, inputStyle: { width:'4em' }, labelStyle: { marginLeft: '.1em' }, maxLength:5, @@ -307,7 +307,7 @@ class TextInputBox extends React.Component { }; } /** - * + * * @param {string} val block or none */ _setDisplay(val) { @@ -339,7 +339,7 @@ class TextInputBox extends React.Component { } /** * Get the value in the text box - * @returns {number} inputValue Value of the input box + * @returns {number} inputValue Value of the input box */ _getValue() { return this.state.inputValue; @@ -348,7 +348,7 @@ class TextInputBox extends React.Component { * Update and set limits on input box * values depending on what user * has selected - * + * * @param {SyntheticEvent} event ReactJs onChange event */ _handleChange(event) { diff --git a/src/app/components/SvgIcons.jsx b/src/app/components/SvgIcons.jsx index c226f892..3b495a58 100644 --- a/src/app/components/SvgIcons.jsx +++ b/src/app/components/SvgIcons.jsx @@ -247,7 +247,7 @@ export class OrbisIcon extends SvgIcon { - ); + ); } } @@ -741,9 +741,9 @@ export class Modified extends SvgIcon { */ svg() { return - - - ; + + + ; } } diff --git a/src/app/components/Tooltip.jsx b/src/app/components/Tooltip.jsx index c100857f..70ec583c 100644 --- a/src/app/components/Tooltip.jsx +++ b/src/app/components/Tooltip.jsx @@ -6,7 +6,6 @@ import TranslatedComponent from './TranslatedComponent'; * Document Root Tooltip */ export default class Tooltip extends TranslatedComponent { - static propTypes = { rect: PropTypes.object.isRequired, options: PropTypes.object @@ -127,5 +126,4 @@ export default class Tooltip extends TranslatedComponent { ; } - } diff --git a/src/app/components/TranslatedComponent.jsx b/src/app/components/TranslatedComponent.jsx index 7f9001a8..46b9787a 100644 --- a/src/app/components/TranslatedComponent.jsx +++ b/src/app/components/TranslatedComponent.jsx @@ -6,7 +6,6 @@ import { shallowEqual } from '../utils/UtilityFunctions'; * Abstract Translated Component */ export default class TranslatedComponent extends React.Component { - static contextTypes = { language: PropTypes.object.isRequired, sizeRatio: PropTypes.number.isRequired, diff --git a/src/app/pages/ErrorDetails.jsx b/src/app/pages/ErrorDetails.jsx index 5c68b8c9..129695ba 100644 --- a/src/app/pages/ErrorDetails.jsx +++ b/src/app/pages/ErrorDetails.jsx @@ -5,7 +5,6 @@ import PropTypes from 'prop-types'; * Unexpected Error page / block */ export default class ErrorDetails extends React.Component { - static contextTypes = { route: PropTypes.object.isRequired, language: PropTypes.object.isRequired @@ -46,7 +45,7 @@ export default class ErrorDetails extends React.Component {

Jameson, we have a problem..

{error.message}


- {importerror ?
If you are attempting to import a ship from EDDI or EDMC and are seeing a 'Z_BUF_ERROR' it means that the URL has not been provided correctly. This is a common problem when using Microsoft Internet Explorer or Microsoft Edge, and you should use another browser instead.
: null } + {importerror ?
If you are attempting to import a ship from EDDI or EDMC and are seeing a 'Z_BUF_ERROR' it means that the URL has not been provided correctly. This is a common problem when using Microsoft Internet Explorer or Microsoft Edge, and you should use another browser instead.
: null }
Please note that this site uses Google Analytics to track performance and usage. If you are blocking cookies, for example using Ghostery, please disable blocking for this site and try again.

diff --git a/src/app/pages/Page.jsx b/src/app/pages/Page.jsx index 76c86c5f..a1910ce1 100644 --- a/src/app/pages/Page.jsx +++ b/src/app/pages/Page.jsx @@ -7,7 +7,6 @@ import { shallowEqual } from '../utils/UtilityFunctions'; * Abstract/Base Page */ export default class Page extends React.Component { - static contextTypes = { closeMenu: PropTypes.func.isRequired, hideModal: PropTypes.func.isRequired, @@ -84,5 +83,4 @@ export default class Page extends React.Component { } return this.renderPage(); } - }
{canThrust - ? {int(speed)}{u['m/s']} - : 0 - } {canBoost - ? {int(shipBoost)}{u['m/s']} - : 0 - } {canJump + >{canJump ? // TODO: - ? {NaN}{u.LY} - : 0 - } {canJump + >{canJump ? // TODO: - ? {NaN}{u.LY} - : 0 - } {canJump - ? {f2(jumpRangeMetrics.jumpRange)}{u.LY} - : 0 - } {canJump + >{canJump ? // TODO: - ? {NaN}{u.LY} - : 0 - } {canJump - ? {f2(jumpRangeMetrics.totalRange)}{u.LY} - : 0 - }
{translate(shieldGenerator.readMeta('type') || 'No Shield')}{formats.pct1(1 - sgMetrics.explosive.damageMultiplier)}{formats.pct1(1 - sgMetrics.kinetic.damageMultiplier)}{formats.pct1(1 - sgMetrics.thermal.damageMultiplier)}
{translate(shieldGenerator.readMeta('type') || 'No Shield')}{formats.pct1(1 - sgMetrics.explosive.damageMultiplier)}{formats.pct1(1 - sgMetrics.kinetic.damageMultiplier)}{formats.pct1(1 - sgMetrics.thermal.damageMultiplier)}{int(sgMetrics.shieldStrength || 0)}{u.MJ}{int(sgMetrics.shieldStrength / sgMetrics.explosive.damageMultiplier || 0)}{u.MJ}{int(sgMetrics.shieldStrength / sgMetrics.kinetic.damageMultiplier || 0)}{u.MJ}{int(sgMetrics.shieldStrength / sgMetrics.thermal.damageMultiplier || 0)}{u.MJ}{formats.time(sgMetrics.recover) || translate('Never')}{formats.time(sgMetrics.recharge) || translate('Never')}
{int(sgMetrics.shieldStrength || 0)}{u.MJ}{int(sgMetrics.shieldStrength / sgMetrics.explosive.damageMultiplier || 0)}{u.MJ}{int(sgMetrics.shieldStrength / sgMetrics.kinetic.damageMultiplier || 0)}{u.MJ}{int(sgMetrics.shieldStrength / sgMetrics.thermal.damageMultiplier || 0)}{u.MJ}{formats.time(sgMetrics.recover) || translate('Never')}{formats.time(sgMetrics.recharge) || translate('Never')}
{translate('internal protection')}
{`${translate('explosive')}`}{`${translate('explosive')}`} {`${translate('kinetic')}`} {`${translate('thermal')}`} {`${translate('caustic')}`}