diff --git a/src/components/modals/Settings.jsx b/src/components/modals/Settings.jsx
index b07846cb..94853f8a 100644
--- a/src/components/modals/Settings.jsx
+++ b/src/components/modals/Settings.jsx
@@ -16,7 +16,7 @@ export default class Settings extends React.PureComponent {
case 'greetingName': document.getElementById('greetingName').value = ''; break;
case 'customBackgroundColour':
localStorage.setItem('customBackgroundColour', '');
- document.getElementById('customBackgroundColour').enabled = 'false';
+ document.getElementById('customBackgroundHex').textContent = 'Disabled';
break;
case 'customBackground': document.getElementById('customBackground').value = ''; break;
case 'blur':
@@ -90,12 +90,6 @@ export default class Settings extends React.PureComponent {
};
};
- /*const hex = localStorage.getItem('customBackgroundColour');
- if (!hex === '') {
- document.getElementById('customBackgroundColour').value = hex;
- document.getElementById('customBackgroundHex').innerText = hex;
- }*/
-
document.getElementById('backgroundImage').classList.toggle('backgroundEffects');
document.getElementById('center').classList.toggle('backgroundEffects');
}
@@ -112,10 +106,10 @@ export default class Settings extends React.PureComponent {
return
×
{this.props.modalLanguage.title}
-
-
-
-
+
+
+
+
diff --git a/src/components/modals/settings/sections/BackgroundSettings.jsx b/src/components/modals/settings/sections/BackgroundSettings.jsx
index b50c68af..680693f7 100644
--- a/src/components/modals/settings/sections/BackgroundSettings.jsx
+++ b/src/components/modals/settings/sections/BackgroundSettings.jsx
@@ -19,6 +19,12 @@ export default class BackgroundSettings extends React.PureComponent {
reader.readAsDataURL(file);
};
+
+ const hex = localStorage.getItem('customBackgroundColour');
+ if (hex !== '') {
+ document.getElementById('customBackgroundColour').value = hex;
+ document.getElementById('customBackgroundHex').innerText = hex;
+ } else document.getElementById('customBackgroundHex').innerText = 'Disabled';
}
render() {
@@ -50,11 +56,11 @@ export default class BackgroundSettings extends React.PureComponent {
- { /*
- {this.props.language.background.customcolour} this.resetItem('customBackgroundColour')}>Reset
+ */ }
+
);
}
diff --git a/src/modules/settingsFunctions.js b/src/modules/settingsFunctions.js
index 8f90d16c..f833647e 100644
--- a/src/modules/settingsFunctions.js
+++ b/src/modules/settingsFunctions.js
@@ -59,13 +59,16 @@ export default class SettingsFunctions {
localStorage.setItem('brightness', document.getElementById('brightnessRange').value);
localStorage.setItem('greetingName', document.getElementById('greetingName').value);
localStorage.setItem('customBackground', document.getElementById('customBackground').value);
+ if (document.getElementById('customBackgroundHex').textContent !== 'Disabled') {
+ localStorage.setItem('customBackgroundColour', document.getElementById('customBackgroundHex').textContent);
+ }
if (!document.getElementById('searchEngineInput').enabled === 'false') {
localStorage.setItem('customSearchEngine', document.getElementById('searchEngineInput').value);
}
window.location.reload();
}
- static async setDefaultSettings() {
+ static setDefaultSettings() {
localStorage.clear();
defaultSettings.forEach((element) => localStorage.setItem(element.name, element.value));