fix: url regex and language for add quick link, slider fixes

This commit is contained in:
David Ralph
2021-04-26 17:49:20 +01:00
parent 84571682b0
commit 57cc5de60a
2 changed files with 10 additions and 8 deletions

View File

@@ -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 = <input className='sliderText' type='number' min={this.props.min} max={this.props.max} onChange={(e) => this.handleChange(e, text)} value={this.state.value} style={{ width: this.state.numberWidth }}/>;
const text = <input className='sliderText' type='number' min={this.props.min} max={this.props.max} onChange={(e) => this.handleChange(e, 'text')} value={this.state.value} style={{ width: this.state.numberWidth }}/>;
return (
<>

View File

@@ -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) {