diff --git a/src/components/modals/main/settings/Slider.jsx b/src/components/modals/main/settings/Slider.jsx index c4905836..42e72138 100644 --- a/src/components/modals/main/settings/Slider.jsx +++ b/src/components/modals/main/settings/Slider.jsx @@ -20,17 +20,17 @@ export default class Slider extends React.PureComponent { let { value } = e.target; if (text) { - if (value.includes('.')) { + if (value === '') { return this.setState({ - value: this.state.value + value: 0 }); } - if (value > this.props.max) { + if (Number(value) > this.props.max) { value = this.props.max; } - if (value < this.props.min) { + if (Number(value) < this.props.min) { value = this.props.min; } } @@ -56,7 +56,7 @@ export default class Slider extends React.PureComponent { } render() { - const text = this.handleChange(e, text)} value={this.state.value} style={{ width: this.state.numberWidth }}/>; + const text = this.handleChange(e, 'text')} value={this.state.value} style={{ width: this.state.numberWidth }}/>; return ( <> diff --git a/src/components/widgets/quicklinks/QuickLinks.jsx b/src/components/widgets/quicklinks/QuickLinks.jsx index b91a6c0c..3d35af53 100644 --- a/src/components/widgets/quicklinks/QuickLinks.jsx +++ b/src/components/widgets/quicklinks/QuickLinks.jsx @@ -1,3 +1,4 @@ +/* eslint-disable no-useless-escape */ import React from 'react'; import EventBus from '../../../modules/helpers/eventbus'; @@ -39,11 +40,12 @@ export default class QuickLinks extends React.PureComponent { let nameError, urlError; if (this.state.name.length <= 0) { - nameError = 'Must provide name'; + nameError = this.language.name_error; } - if (url.length <= 0) { - urlError = 'Must provide URL'; + // regex: https://ihateregex.io/expr/url/ + if (url.length <= 0 || /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()!@:%_\+.~#?&\/\/=]*)/.test(url) === false) { + urlError = this.language.url_error; } if (nameError || urlError) {