From d7be6e351d22514408a9e046897ee31da9a17ae5 Mon Sep 17 00:00:00 2001 From: David Ralph Date: Mon, 19 Jul 2021 10:20:00 +0100 Subject: [PATCH] fix: firefox changelog date, cleanup background a bit --- package.json | 4 ++-- src/components/modals/main/settings/sections/Changelog.jsx | 2 +- src/components/widgets/background/Background.jsx | 6 +----- src/components/widgets/background/PhotoInformation.jsx | 6 ++++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index fd64b256..ff93687f 100644 --- a/package.json +++ b/package.json @@ -39,9 +39,9 @@ "babel-loader": "^8.2.2", "babel-plugin-transform-react-class-to-function": "^1.2.2", "copy-webpack-plugin": "^9.0.1", - "css-loader": "^6.0.0", + "css-loader": "^6.1.0", "date-fns": "^2.22.1", - "eslint": "^7.30.0", + "eslint": "^7.31.0", "eslint-config-react-app": "^6.0.0", "html-webpack-plugin": "^5.3.2", "mini-css-extract-plugin": "^2.1.0", diff --git a/src/components/modals/main/settings/sections/Changelog.jsx b/src/components/modals/main/settings/sections/Changelog.jsx index b63517fc..0bb8473d 100644 --- a/src/components/modals/main/settings/sections/Changelog.jsx +++ b/src/components/modals/main/settings/sections/Changelog.jsx @@ -25,7 +25,7 @@ export default class Changelog extends React.PureComponent { return; } - let date = new Date(data.date); + let date = new Date(data.date.split(' ')[0]); date = date.toLocaleDateString(window.languagecode.replace('_', '-'), { year: 'numeric', month: 'long', diff --git a/src/components/widgets/background/Background.jsx b/src/components/widgets/background/Background.jsx index 36ba6153..a8555d91 100644 --- a/src/components/widgets/background/Background.jsx +++ b/src/components/widgets/background/Background.jsx @@ -99,7 +99,6 @@ export default class Background extends React.PureComponent { backgroundImage.classList.remove('backgroundPreload'); backgroundImage.classList.add('fade-in'); - // this doesn't make it fetch again which is nice backgroundImage.style.background = `url(${url})`; // remove the preloader element we created earlier preloader.remove(); @@ -149,7 +148,6 @@ export default class Background extends React.PureComponent { let requestURL, data; switch (backgroundAPI) { case 'unsplash': - //requestURL = `${window.constants.UNSPLASH_URL}/getImage?category=${apiCategory}`; requestURL = `${window.constants.UNSPLASH_URL}/images/random?quality=${apiQuality}`; break; case 'pexels': @@ -169,8 +167,7 @@ export default class Background extends React.PureComponent { } let credit = data.photographer; - let photoURL = ''; - let photographerURL = ''; + let photoURL, photographerURL; if (backgroundAPI === 'unsplash') { credit = data.photographer + ` ${this.language.unsplash}`; @@ -308,7 +305,6 @@ export default class Background extends React.PureComponent { document.getElementById('backgroundVideo').style.display = 'block'; } else { if (this.state.photoInfo.hidden === false) { - // fix bug try { document.querySelector('.photoInformation').style.display = 'block'; } catch (e) { diff --git a/src/components/widgets/background/PhotoInformation.jsx b/src/components/widgets/background/PhotoInformation.jsx index d77cee19..a811246c 100644 --- a/src/components/widgets/background/PhotoInformation.jsx +++ b/src/components/widgets/background/PhotoInformation.jsx @@ -61,7 +61,9 @@ export default function PhotoInformation(props) { return (

{photo} {credit}

- {localStorage.getItem('photoInformation') !== 'false' ? <> + {localStorage.getItem('photoInformation') !== 'false' ? + <> +

{language.information}

@@ -80,7 +82,7 @@ export default function PhotoInformation(props) { downloadImage(props.info)}>{language.download} : null}
- : null} + : null}
); }