david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes according to Eslint

Browse Source
This commit is contained in:
Daniël van Noord
2021-03-16 09:32:50 +01:00
parent 26d8e75935
commit a65af049b6
63 changed files with 314 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Config/SaveLoadReload/SaveLoadReloadSettings.js
View File

@@ -1,5 +1,5 @@
import { default as ConfigDefault } from '../../Data/SettingsDefault';
import { default as ConfigData } from '../../Data/SettingsData';
import ConfigDefault from '../../Data/SettingsDefault';
import ConfigData from '../../Data/SettingsData';
import { CMOptions } from '../VariablesAndData';
import save from '../../InitSaveLoad/save';
import CMLoop from '../../Main/Loop';
@@ -43,7 +43,7 @@ export function LoadConfig(settings) {
// Check values
let mod = false;
for (const i in ConfigDefault) {
Object.keys(ConfigDefault).forEach((i) => {
if (typeof CMOptions[i] === 'undefined') {
mod = true;
CMOptions[i] = ConfigDefault[i];
@@ -61,7 +61,7 @@ export function LoadConfig(settings) {
CMOptions[i] = ConfigDefault[i];
}
} else if (i === 'Header') {
for (const j in ConfigDefault.Header) {
Object.keys(ConfigDefault.Header).forEach((j) => {
if (
typeof CMOptions[i][j] === 'undefined' ||
!(CMOptions[i][j] > -1 && CMOptions[i][j] < 2)
@@ -69,10 +69,10 @@ export function LoadConfig(settings) {
mod = true;
CMOptions[i][j] = ConfigDefault[i][j];
}
}
});
} else {
// Colors
for (const j in ConfigDefault.Colors) {
Object.keys(ConfigDefault.Colors).forEach((j) => {
if (
typeof CMOptions[i][j] === 'undefined' ||
typeof CMOptions[i][j] !== 'string'
@@ -80,16 +80,16 @@ export function LoadConfig(settings) {
mod = true;
CMOptions[i][j] = ConfigDefault[i][j];
}
}
});
}
}
});
if (mod) SaveConfig();
CMLoop(); // Do loop once
for (const i in ConfigDefault) {
Object.keys(ConfigDefault).forEach((i) => {
if (i !== 'Header' && typeof ConfigData[i].func !== 'undefined') {
ConfigData[i].func();
}
}
});
} else {
// Default values
LoadConfig(ConfigDefault);

6
src/Config/ToggleSetting.js
View File

@@ -1,4 +1,4 @@
import { default as ConfigData } from '../Data/SettingsData';
import ConfigData from '../Data/SettingsData';
import { SaveConfig } from './SaveLoadReload/SaveLoadReloadSettings';
import { CMOptions } from './VariablesAndData';
@@ -13,7 +13,7 @@ export const ConfigPrefix = 'CMConfig';
* @param {string} config The name of the option
*/
export function ToggleConfig(config) {
CMOptions[config]++;
CMOptions[config] += 1;
if (CMOptions[config] === ConfigData[config].label.length) {
CMOptions[config] = 0;
@@ -49,7 +49,7 @@ export function ToggleConfigVolume(config) {
* @param {string} config The name of the header
*/
export function ToggleHeader(config) {
CMOptions.Header[config]++;
CMOptions.Header[config] += 1;
if (CMOptions.Header[config] > 1) CMOptions.Header[config] = 0;
SaveConfig();
}

7
src/Config/Toggles/ToggleGCTimer.js
View File

@@ -1,3 +1,4 @@
/* eslint-disable no-return-assign */
import { CacheGoldenShimmersByID } from '../../Cache/VariablesAndData';
import { GCTimers } from '../../Disp/VariablesAndData';
import { CMOptions } from '../VariablesAndData';
@@ -8,12 +9,12 @@ import { CMOptions } from '../VariablesAndData';
*/
export default function ToggleGCTimer() {
if (CMOptions.GCTimer === 1) {
for (const i of Object.keys(GCTimers)) {
Object.keys(GCTimers).forEach((i) => {
GCTimers[i].style.display = 'block';
GCTimers[i].style.left = CacheGoldenShimmersByID[i].l.style.left;
GCTimers[i].style.top = CacheGoldenShimmersByID[i].l.style.top;
}
});
} else {
for (const i of Object.keys(GCTimers)) GCTimers[i].style.display = 'none';
Object.keys(GCTimers).forEach((i) => (GCTimers[i].style.display = 'none'));
}
}