From af2e0cbed31d3fb2678cd1b648303ccd46198073 Mon Sep 17 00:00:00 2001
From: Cmdr McDonald <Cmdr.McDonald@gmail.com>
Date: Sat, 25 Feb 2017 22:18:09 +0000
Subject: [PATCH] Fixes

---
 ChangeLog.md                       |  1 +
 package.json                       |  4 ++--
 src/app/components/DamageDealt.jsx |  2 +-
 src/app/components/LineChart.jsx   |  5 +++--
 src/app/pages/OutfittingPage.jsx   |  1 +
 webpack.config.dev.js              |  2 +-
 webpack.config.prod.js             | 13 -------------
 7 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 2bc78e4b..581d8365 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,6 +1,7 @@
 #2.2.19
   * Power management panel now displays modules in descending order of power usage by default
   * Shot speed can no longer be modified directly.  Its value is derived from the range modifier for Long Range and Focused modifications
+  * Ensure that jump range chart updates when fuel slider is changed
 
 #2.2.18
   * Change methodology for calculating explorer role; can result in lighter builds
diff --git a/package.json b/package.json
index e8ae4094..abc271b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coriolis_shipyard",
-  "version": "2.2.18",
+  "version": "2.2.19b",
   "repository": {
     "type": "git",
     "url": "https://github.com/EDCD/coriolis"
@@ -19,7 +19,7 @@
     "test": "jest",
     "prod-serve": "nginx -p $(pwd) -c nginx.conf",
     "prod-stop": "kill -QUIT $(cat nginx.pid)",
-    "build": "npm run clean && NODE_ENV=production webpack -d -p --config webpack.config.prod.js",
+    "build": "npm run clean && NODE_ENV=production webpack -p --config webpack.config.prod.js",
     "rsync": "rsync -ae \"ssh -i $CORIOLIS_PEM\" --delete build/ $CORIOLIS_USER@$CORIOLIS_HOST:~/wwws",
     "deploy": "npm run lint && npm test && npm run build && npm run rsync"
   },
diff --git a/src/app/components/DamageDealt.jsx b/src/app/components/DamageDealt.jsx
index 2e048c97..bb4bd484 100644
--- a/src/app/components/DamageDealt.jsx
+++ b/src/app/components/DamageDealt.jsx
@@ -494,7 +494,7 @@ export default class DamageDealt extends TranslatedComponent {
     const sortOrder = this._sortOrder;
     const onCollapseExpand = this._onCollapseExpand;
 
-    const code = ship.getHardpointsString() + '.' + ship.getModificationsString() + '.' + against.properties.name;
+    const code = ship.getHardpointsString() + '.' + ship.getModificationsString() + '.' + ship.getPowerEnabledString() + '.' + against.properties.name;
 
     return (
       <span>
diff --git a/src/app/components/LineChart.jsx b/src/app/components/LineChart.jsx
index 484d9491..7e6b2603 100644
--- a/src/app/components/LineChart.jsx
+++ b/src/app/components/LineChart.jsx
@@ -176,7 +176,6 @@ export default class LineChart extends TranslatedComponent {
       seriesData = [[0, yVal], [1, yVal]];
     }
 
-
     const markerElems = [];
     const detailElems = [<text key='lbl' className='text-tip x' y='1.25em'/>];
     const seriesLines = [];
@@ -187,7 +186,9 @@ export default class LineChart extends TranslatedComponent {
       markerElems.push(<circle key={i} className='marker' r='4' />);
     }
 
-    this.setState({ markerElems, detailElems, seriesLines, seriesData });
+    const tipHeight = 2 + (1.2 * (seriesLines ? seriesLines.length : 0.8))
+
+    this.setState({ markerElems, detailElems, seriesLines, seriesData, tipHeight });
   }
 
   /**
diff --git a/src/app/pages/OutfittingPage.jsx b/src/app/pages/OutfittingPage.jsx
index 6819a8a7..f7ea7c64 100644
--- a/src/app/pages/OutfittingPage.jsx
+++ b/src/app/pages/OutfittingPage.jsx
@@ -399,6 +399,7 @@ export default class OutfittingPage extends Page {
             yLabel={translate('jump range')}
             xLabel={translate('cargo')}
             func={state.jumpRangeChartFunc}
+            code={state.fuelLevel}
           />
           <table style={{ width: '100%', lineHeight: '1em', backgroundColor: 'transparent' }}>
             <tbody >
diff --git a/webpack.config.dev.js b/webpack.config.dev.js
index 27789b0e..0613aa29 100644
--- a/webpack.config.dev.js
+++ b/webpack.config.dev.js
@@ -52,7 +52,7 @@ module.exports = {
         allChunks: true
     }),
     new webpack.HotModuleReplacementPlugin(),
-    new webpack.NoErrorsPlugin()
+    new webpack.NoEmitOnErrorsPlugin()
   ],
   module: {
     rules: [
diff --git a/webpack.config.prod.js b/webpack.config.prod.js
index 00c2f03f..82eefb65 100644
--- a/webpack.config.prod.js
+++ b/webpack.config.prod.js
@@ -45,10 +45,6 @@ module.exports = {
   },
   plugins: [
     new webpack.optimize.UglifyJsPlugin({
-      sourceMap: true,
-      mangle: {
-        except: []
-      },
       'screw-ie8': true
     }),
     //new webpack.optimize.CommonsChunkPlugin({
@@ -90,16 +86,7 @@ module.exports = {
     })
   ],
   module: {
-    //noParse: /.*\.min\.js$/,
     rules: [
-      // Expose non-parsed globally scoped libs
-      //{ test: reactPath, loader: "expose-loader?React" },
-      //{ test: d3Path, loader: "expose-loader?d3" },
-      //{ test: lzStringPath, loader: "expose-loader?LZString" },
-      //{ test: reactPath, use: [ { loader: 'expose-loader', options: 'React' } ] },
-      //{ test: d3Path, use: [ { loader: 'expose-loader', options: 'd3' } ] },
-      //{ test: lzStringPath, use: [ { loader: 'expose-loader', options: 'LZString' } ] },
-
       { test: /\.css$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader'}) },
       { test: /\.less$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader',use: 'css-loader!less-loader'}) },
       { test: /\.(js|jsx)$/, loaders: [ 'babel-loader' ], include: path.join(__dirname, 'src') },