From b5339b75ffee4b7bdfc0aec25bbad3f5f74d19d0 Mon Sep 17 00:00:00 2001 From: Qstick Date: Fri, 26 Jan 2018 22:00:32 -0500 Subject: [PATCH] Fixed: Additional UI number input fixes --- frontend/src/Components/Form/NumberInput.js | 30 ++++++++++++++----- frontend/src/Components/Form/TextInput.js | 5 +++- .../HealthCheck/Checks/MonoVersionCheck.cs | 8 ++--- 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/frontend/src/Components/Form/NumberInput.js b/frontend/src/Components/Form/NumberInput.js index 7618ab3c2..f850bcabf 100644 --- a/frontend/src/Components/Form/NumberInput.js +++ b/frontend/src/Components/Form/NumberInput.js @@ -8,24 +8,36 @@ class NumberInput extends Component { // Listeners onChange = ({ name, value }) => { - const { - min, - max - } = this.props; - let newValue = null; if (value) { newValue = this.props.isFloat ? parseFloat(value) : parseInt(value); } - if (min != null && newValue < min) { + this.props.onChange({ + name, + value: newValue + }); + } + + onBlur = () => { + const { + name, + value, + min, + max, + onChange + } = this.props; + + let newValue = value; + + if (min != null && newValue != null && newValue < min) { newValue = min; - } else if (max != null && newValue > max) { + } else if (max != null && newValue != null && newValue > max) { newValue = max; } - this.props.onChange({ + onChange({ name, value: newValue }); @@ -44,12 +56,14 @@ class NumberInput extends Component { type="number" {...otherProps} onChange={this.onChange} + onBlur={this.onBlur} /> ); } } NumberInput.propTypes = { + name: PropTypes.string.isRequired, value: PropTypes.number, min: PropTypes.number, max: PropTypes.number, diff --git a/frontend/src/Components/Form/TextInput.js b/frontend/src/Components/Form/TextInput.js index a787a1d1d..e3a5b2c9f 100644 --- a/frontend/src/Components/Form/TextInput.js +++ b/frontend/src/Components/Form/TextInput.js @@ -122,7 +122,8 @@ class TextInput extends Component { value, hasError, hasWarning, - hasButton + hasButton, + onBlur } = this.props; return ( @@ -143,6 +144,7 @@ class TextInput extends Component { value={value} onChange={this.onChange} onFocus={this.onFocus} + onBlur={onBlur} onKeyUp={this.onKeyUp} onMouseDown={this.onMouseDown} onMouseUp={this.onMouseUp} @@ -164,6 +166,7 @@ TextInput.propTypes = { hasButton: PropTypes.bool, onChange: PropTypes.func.isRequired, onFocus: PropTypes.func, + onBlur: PropTypes.func, onSelectionChange: PropTypes.func }; diff --git a/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs index 7f46a6308..b1bae1b47 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs @@ -1,6 +1,4 @@ using System; -using System.Linq; -using System.Reflection; using NLog; using NzbDrone.Common.EnvironmentInfo; @@ -26,15 +24,15 @@ namespace NzbDrone.Core.HealthCheck.Checks var monoVersion = _platformInfo.Version; - if (monoVersion == new Version("4.4") || monoVersion == new Version("4.4.1")) + if (monoVersion == new Version("4.4.0") || monoVersion == new Version("4.4.1")) { _logger.Debug("Mono version {0}", monoVersion); return new HealthCheck(GetType(), HealthCheckResult.Error, $"Your Mono version {monoVersion} has a bug that causes issues connecting to indexers/download clients. You should upgrade to a higher version"); } - if (monoVersion >= new Version("4.4")) + if (monoVersion >= new Version("4.4.2")) { - _logger.Debug("Mono version is 4.4 or better: {0}", monoVersion); + _logger.Debug("Mono version is 4.4.2 or better: {0}", monoVersion); return new HealthCheck(GetType()); }