fix: custom background settings

This commit is contained in:
David Ralph
2021-04-13 14:36:21 +01:00
parent 1fb0af10a8
commit 81787211b8
2 changed files with 18 additions and 18 deletions

View File

@@ -30,10 +30,17 @@ export default class BackgroundSettings extends React.PureComponent {
toast(this.language.toasts.reset);
}
customBackground(e) {
localStorage.setItem('customBackground', e.target.result);
customBackground(e, text) {
let result;
if (text === true) {
result = e.target.value;
} else {
result = e.target.result;
}
localStorage.setItem('customBackground', result);
this.setState({
customBackground: e.target.result
customBackground: result
});
}
@@ -102,7 +109,7 @@ export default class BackgroundSettings extends React.PureComponent {
<>
<ul>
<p>{background.source.custom_background} <span className='modalLink' onClick={this.resetCustom}>{this.language.buttons.reset}</span></p>
<input type='text' value={this.state.customBackground} onChange={(e) => this.customBackground(e)}></input>
<input type='text' value={this.state.customBackground} onChange={(e) => this.customBackground(e, true)}></input>
<span className='modalLink' onClick={() => document.getElementById('bg-input').click()}>{background.source.upload}</span>
<FileUpload id='bg-input' accept='image/jpeg, image/png, image/webp, image/webm, image/gif, video/mp4, video/webm, video/ogg' loadFunction={(e) => this.customBackground(e)} />
</ul>

View File

@@ -36,6 +36,10 @@ export default class Background extends React.PureComponent {
});
}
videoCheck(url) {
return url.startsWith('data:video/') || url.endsWith('.mp4') || url.endsWith('.webm') || url.endsWith('.ogg')
}
offlineBackground() {
const offlineImages = require('./offline_images.json');
@@ -189,26 +193,15 @@ export default class Background extends React.PureComponent {
return this.offlineBackground();
}
if (customBackground !== '') {
// video background
if (customBackground.startsWith('data:video/') || customBackground.endsWith('.mp4') || customBackground.endsWith('.webm') || customBackground.endsWith('.ogg')) {
return this.setState({
url: customBackground,
video: true,
photoInfo: {
hidden: true
}
});
// normal background
} else {
return this.setState({
if (customBackground !== '' && customBackground !== 'undefined') {
this.setState({
url: customBackground,
video: this.videoCheck(customBackground),
photoInfo: {
hidden: true
}
});
}
}
break;
case 'photo_pack':