mirror of
https://github.com/mue/mue.git
synced 2026-06-11 19:18:57 +02:00
fix: various fixes and remove unused code
This commit is contained in:
@@ -40,5 +40,5 @@
|
||||
}
|
||||
|
||||
.micActive {
|
||||
box-shadow: 0px 0px 50px 9px #e74c3c !important;
|
||||
box-shadow: 0px 0px 50px 1px #e74c3c !important;
|
||||
}
|
||||
|
||||
@@ -68,10 +68,12 @@ export default class BackgroundSettings extends PureComponent {
|
||||
subtitle={variables.getMessage(
|
||||
'modals.mani.settings.sections.background.intervanl.subtitle',
|
||||
)}
|
||||
final={localStorage.getItem('photo_packs') &&
|
||||
this.state.backgroundType !== 'custom' &&
|
||||
this.state.backgroundType !== 'colour' &&
|
||||
this.state.backgroundType !== 'api'}
|
||||
final={
|
||||
localStorage.getItem('photo_packs') &&
|
||||
this.state.backgroundType !== 'custom' &&
|
||||
this.state.backgroundType !== 'colour' &&
|
||||
this.state.backgroundType !== 'api'
|
||||
}
|
||||
>
|
||||
<Dropdown
|
||||
label={variables.getMessage('modals.main.settings.sections.background.interval.title')}
|
||||
@@ -80,9 +82,7 @@ export default class BackgroundSettings extends PureComponent {
|
||||
value2={Date.now()}
|
||||
>
|
||||
<option value="refresh">{variables.getMessage('tabname')}</option>
|
||||
<option value="10000">
|
||||
10 secs
|
||||
</option>
|
||||
<option value="10000">10 secs</option>
|
||||
<option value="60000">
|
||||
{variables.getMessage('modals.main.settings.sections.background.interval.minute')}
|
||||
</option>
|
||||
@@ -433,9 +433,11 @@ export default class BackgroundSettings extends PureComponent {
|
||||
</Dropdown>
|
||||
</SettingsItem>
|
||||
{/* // todo: ideally refactor all of this file, but we need interval to appear on marketplace too */}
|
||||
{(this.state.backgroundType === 'api' ||
|
||||
this.state.backgroundType === 'custom' ||
|
||||
this.state.marketplaceEnabled) ? interval : null}
|
||||
{this.state.backgroundType === 'api' ||
|
||||
this.state.backgroundType === 'custom' ||
|
||||
this.state.marketplaceEnabled
|
||||
? interval
|
||||
: null}
|
||||
{backgroundSettings}
|
||||
</>
|
||||
) : null}
|
||||
|
||||
@@ -27,7 +27,10 @@ export default class Maximise extends PureComponent {
|
||||
|
||||
let backgroundFilter;
|
||||
if (filter === true) {
|
||||
backgroundFilter = localStorage.getItem('backgroundFilter');
|
||||
const filterData = localStorage.getItem('backgroundFilter');
|
||||
if (filterData !== 'none') {
|
||||
backgroundFilter = filterData;
|
||||
}
|
||||
}
|
||||
|
||||
element.setAttribute(
|
||||
|
||||
@@ -17,7 +17,6 @@ import ShareModal from '../../helpers/sharemodal/ShareModal';
|
||||
|
||||
import offline_quotes from './offline_quotes.json';
|
||||
|
||||
import Interval from 'modules/helpers/interval';
|
||||
import EventBus from 'modules/helpers/eventbus';
|
||||
|
||||
import './quote.scss';
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import variables from 'modules/variables';
|
||||
import { PureComponent, createRef } from 'react';
|
||||
import { MdSearch, MdMic, MdSettings } from 'react-icons/md';
|
||||
import { MdSearch, MdMic, MdScreenSearchDesktop } from 'react-icons/md';
|
||||
import Tooltip from 'components/helpers/tooltip/Tooltip';
|
||||
|
||||
import AutocompleteInput from 'components/helpers/autocomplete/Autocomplete';
|
||||
@@ -133,15 +133,9 @@ export default class Search extends PureComponent {
|
||||
}
|
||||
|
||||
toggleDropdown() {
|
||||
if (this.state.searchDropdown === 'hidden') {
|
||||
this.setState({
|
||||
searchDropdown: 'visible',
|
||||
});
|
||||
} else {
|
||||
this.setState({
|
||||
searchDropdown: 'hidden',
|
||||
});
|
||||
}
|
||||
this.setState({
|
||||
searchDropdown: (this.state.searchDropdown === 'hidden') ? 'visible' : 'hidden',
|
||||
});
|
||||
}
|
||||
|
||||
setSearch(name, custom) {
|
||||
@@ -201,7 +195,7 @@ export default class Search extends PureComponent {
|
||||
{localStorage.getItem('searchDropdown') === 'true' ? (
|
||||
<Tooltip title={variables.getMessage('widgets.search')}>
|
||||
<button>
|
||||
<MdSettings onClick={() => this.toggleDropdown()} />
|
||||
<MdScreenSearchDesktop onClick={() => this.toggleDropdown()} />
|
||||
</button>
|
||||
</Tooltip>
|
||||
) : (
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
// based on https://stackoverflow.com/a/47009962
|
||||
// it has been brought to my attention (many) times that this is horribly broken if the time
|
||||
// on the "Change every" setting is longer than 1 minute. I wasn't going to wait days to see
|
||||
// if the function worked, so i just assumed it did. i apologise. this function will be
|
||||
// replaced entirely in the future probably
|
||||
export default function interval(callback, interval, name) {
|
||||
const key = name + 'interval';
|
||||
const ms = localStorage.getItem(key);
|
||||
const now = Date.now();
|
||||
|
||||
const executeCallback = () => {
|
||||
localStorage.setItem(key, Date.now());
|
||||
callback();
|
||||
};
|
||||
|
||||
if (ms) {
|
||||
const delta = now - parseInt(ms);
|
||||
if (delta > interval) {
|
||||
setInterval(executeCallback, interval);
|
||||
} else {
|
||||
setTimeout(() => {
|
||||
setInterval(executeCallback, interval);
|
||||
executeCallback();
|
||||
}, interval - delta);
|
||||
}
|
||||
} else {
|
||||
setInterval(executeCallback, interval);
|
||||
}
|
||||
|
||||
localStorage.setItem(key, now);
|
||||
}
|
||||
Reference in New Issue
Block a user