From ed38bc2cbb5b06a169465c02288cadaadcd606a9 Mon Sep 17 00:00:00 2001 From: David Ralph Date: Fri, 18 Sep 2020 12:58:37 +0100 Subject: [PATCH] add custom search engine back --- src/components/modals/Settings.jsx | 1 + .../settings/sections/BackgroundSettings.jsx | 2 -- .../modals/settings/sections/SearchSettings.jsx | 15 ++++++++++++--- src/components/widgets/Search.jsx | 3 +++ src/modules/settingsFunctions.js | 9 +++++---- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/components/modals/Settings.jsx b/src/components/modals/Settings.jsx index 94853f8a..3e719301 100644 --- a/src/components/modals/Settings.jsx +++ b/src/components/modals/Settings.jsx @@ -68,6 +68,7 @@ export default class Settings extends React.PureComponent { document.getElementById('searchEngine').style.color = 'white'; document.getElementById('language').style.color = 'white'; document.getElementById('greetingName').style.color = 'white'; + document.getElementById('customSearchEngine').style.color = 'white'; const choices = document.getElementsByClassName('choices'); for (let i = 0; i < choices.length; i++) choices[i].style.backgroundColor = '#2f3542'; } diff --git a/src/components/modals/settings/sections/BackgroundSettings.jsx b/src/components/modals/settings/sections/BackgroundSettings.jsx index 680693f7..a780dd76 100644 --- a/src/components/modals/settings/sections/BackgroundSettings.jsx +++ b/src/components/modals/settings/sections/BackgroundSettings.jsx @@ -13,8 +13,6 @@ export default class BackgroundSettings extends React.PureComponent { localStorage.setItem('customBackground', e.target.result); document.getElementById('customBackground').src = e.target.result; document.getElementById('customBackground').value = e.target.result; - document.getElementById('backgroundImage').setAttribute('style', `-webkit-filter:blur(${localStorage.getItem('blur')}px); background-image: url(${localStorage.getItem('customBackground')}`); - document.getElementById('backgroundImage').style.backgroundImage = `url(${localStorage.getItem('customBackground')})`; }); reader.readAsDataURL(file); diff --git a/src/components/modals/settings/sections/SearchSettings.jsx b/src/components/modals/settings/sections/SearchSettings.jsx index cde6bfdb..b9070816 100644 --- a/src/components/modals/settings/sections/SearchSettings.jsx +++ b/src/components/modals/settings/sections/SearchSettings.jsx @@ -2,10 +2,19 @@ import React from 'react'; import SettingsFunctions from '../../../../modules/settingsFunctions'; export default class SearchSettings extends React.PureComponent { + componentDidMount() { + if (localStorage.getItem('searchEngine') === 'custom') { + const input = document.getElementById('searchEngineInput'); + input.style.display = 'block'; + input.enabled = 'true'; + document.getElementById('customSearchEngine').value = localStorage.getItem('customSearchEngine'); + } else localStorage.removeItem('customSearchEngine'); + } + render() { return (
-
diff --git a/src/components/widgets/Search.jsx b/src/components/widgets/Search.jsx index b062981f..bf48588c 100644 --- a/src/components/widgets/Search.jsx +++ b/src/components/widgets/Search.jsx @@ -21,6 +21,9 @@ export default class Search extends React.PureComponent { default: url = 'https://duckduckgo.com'; break; } + const custom = localStorage.getItem('customSearchEngine'); + if (custom) url = custom; + const searchButton = () => { let value = document.getElementById('searchtext').value; if (!value) value = 'mue fast'; diff --git a/src/modules/settingsFunctions.js b/src/modules/settingsFunctions.js index f833647e..eaf968dc 100644 --- a/src/modules/settingsFunctions.js +++ b/src/modules/settingsFunctions.js @@ -45,11 +45,11 @@ export default class SettingsFunctions { static setSearchEngine(input) { const searchEngineInput = document.getElementById('searchEngineInput'); if (input === 'custom') { - searchEngineInput.enabled = 'false'; + searchEngineInput.enabled = 'true'; searchEngineInput.style.display = 'block'; } else { searchEngineInput.style.display = 'none'; - searchEngineInput.enabled = 'true'; + searchEngineInput.enabled = 'false'; localStorage.setItem('searchEngine', input); } } @@ -62,8 +62,9 @@ export default class SettingsFunctions { 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); + if (document.getElementById('searchEngineInput').enabled === 'true') { + localStorage.setItem('searchEngine', 'custom'); + localStorage.setItem('customSearchEngine', document.getElementById('customSearchEngine').value); } window.location.reload(); }