From 6ec8b5e7bd32450ee6f8f09d0582465e39789c36 Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Sun, 14 Jul 2024 22:27:08 -0300 Subject: [PATCH] fix: JS code indentation/syntax This commit fixes the syntax and indentation of the JavaScript code to meet the organization standard. --- webroot/js/kernelsu.js | 2 ++ webroot/js/language.js | 45 +++++++++++++----------------- webroot/js/list/language.js | 7 +++-- webroot/js/modal/errorHistory.js | 1 + webroot/js/modal/language.js | 1 + webroot/js/navbar.js | 17 ++++++----- webroot/js/switcher/fontChanger.js | 15 +++++----- webroot/js/theme.js | 9 +++--- webroot/js/themes/dark.js | 4 +-- webroot/js/themes/darkNavbar.js | 25 ++++++----------- webroot/js/themes/light.js | 5 ++-- webroot/js/themes/lightNavbar.js | 1 - webroot/js/translate/action.js | 21 +++++--------- webroot/js/translate/home.js | 35 ++++++++++------------- webroot/js/translate/modules.js | 4 +-- webroot/js/translate/settings.js | 27 ++++++------------ 16 files changed, 93 insertions(+), 126 deletions(-) diff --git a/webroot/js/kernelsu.js b/webroot/js/kernelsu.js index 4121e5d..9dcc033 100644 --- a/webroot/js/kernelsu.js +++ b/webroot/js/kernelsu.js @@ -1,3 +1,5 @@ +/* https://github.com/tiann/KernelSU/tree/main/js / https://www.npmjs.com/package/kernelsu */ + let callbackCounter = 0; function getUniqueCallbackName(prefix) { return `${prefix}_callback_${Date.now()}_${callbackCounter++}`; diff --git a/webroot/js/language.js b/webroot/js/language.js index f6ee88d..a27ff77 100644 --- a/webroot/js/language.js +++ b/webroot/js/language.js @@ -1,7 +1,7 @@ -import { translateActionPage } from "./translate/action.js" -import { translateHomePage } from "./translate/home.js" -import { translateModulesPage } from "./translate/modules.js" -import { translateSettingsPage } from "./translate/settings.js" +import { translateActionPage } from './translate/action.js' +import { translateHomePage } from './translate/home.js' +import { translateModulesPage } from './translate/modules.js' +import { translateSettingsPage } from './translate/settings.js' export async function setNewLanguage(locate, initialize) { const old_translations = await getTranslations(initialize ? 'en_US' : localStorage.getItem('/system/language')) @@ -13,24 +13,17 @@ export async function setNewLanguage(locate, initialize) { translateSettingsPage(new_translations) /* INFO: lang modal */ - document.getElementById('lang_modal_title').innerHTML - = new_translations.modal.language.header + document.getElementById('lang_modal_title').innerHTML = new_translations.modal.language.header /* INFO: error history modal */ - document.getElementById('errorh_modal_title').innerHTML - = new_translations.modal.logs.header - document.getElementById('errorh_panel').placeholder - = new_translations.modal.logs.placeholder + document.getElementById('errorh_modal_title').innerHTML = new_translations.modal.logs.header + document.getElementById('errorh_panel').placeholder = new_translations.modal.logs.placeholder /* INFO: navbar info */ - document.getElementById('nav_home_title').innerHTML - = new_translations.page.home.header - document.getElementById('nav_modules_title').innerHTML - = new_translations.page.modules.header - document.getElementById('nav_actions_title').innerHTML - = new_translations.page.action.header - document.getElementById('nav_settings_title').innerHTML - = new_translations.page.settings.header + document.getElementById('nav_home_title').innerHTML = new_translations.page.home.header + document.getElementById('nav_modules_title').innerHTML = new_translations.page.modules.header + document.getElementById('nav_actions_title').innerHTML = new_translations.page.action.header + document.getElementById('nav_settings_title').innerHTML = new_translations.page.settings.header } export async function getTranslations(locate) { @@ -41,12 +34,12 @@ export async function getTranslations(locate) { /* INFO: This list is in alphabetical order. */ export const avaliableLanguages = [ - "en_US", /* INFO: Translated by @PerformanC (The PerformanC Organization) */ - "ja_JP", /* INFO: Translated by @Fyphen1223 */ - "pt_BR", /* INFO: Translated by @ThePedroo */ - "ro_RO", /* INFO: Translated by @ExtremeXT */ - "ru_RU", /* INFO: Translated by Emulond Argent (@Emulond) */ - "vi_VN", /* INFO: Translated by @RainyXeon (unexpected unresolved) */ - "zh_CN", /* INFO: Translated by @Meltartica */ - "zh_TW", /* INFO: Translated by @Meltartica */ + 'en_US', /* INFO: Translated by @PerformanC (The PerformanC Organization) */ + 'ja_JP', /* INFO: Translated by @Fyphen1223 */ + 'pt_BR', /* INFO: Translated by @ThePedroo */ + 'ro_RO', /* INFO: Translated by @ExtremeXT */ + 'ru_RU', /* INFO: Translated by Emulond Argent (@Emulond) */ + 'vi_VN', /* INFO: Translated by @RainyXeon (unexpected unresolved) */ + 'zh_CN', /* INFO: Translated by @Meltartica */ + 'zh_TW' /* INFO: Translated by @Meltartica */ ] diff --git a/webroot/js/list/language.js b/webroot/js/list/language.js index f9ff312..ad00cb5 100644 --- a/webroot/js/list/language.js +++ b/webroot/js/list/language.js @@ -3,6 +3,7 @@ import { getTranslations, setNewLanguage } from '../language.js' + const lang_list = document.getElementById('lang_modal_list') const target = document.getElementById('lang_modal') @@ -10,8 +11,10 @@ let index = 0 function setAvaliableLanguage() { const langKey = avaliableLanguages[index] + index += 1 - getTranslations(langKey).then(data => { + + getTranslations(langKey).then((data) => { lang_list.innerHTML += `
${data.langName}
@@ -25,7 +28,7 @@ setAvaliableLanguage() document.addEventListener('click', async (event) => { const getLangLocate = event.target.getAttribute('lang-data') - if (!getLangLocate || typeof getLangLocate !== "string") return; + if (!getLangLocate || typeof getLangLocate !== 'string') return; await setNewLanguage(getLangLocate) diff --git a/webroot/js/modal/errorHistory.js b/webroot/js/modal/errorHistory.js index c74bf88..000fac4 100644 --- a/webroot/js/modal/errorHistory.js +++ b/webroot/js/modal/errorHistory.js @@ -25,5 +25,6 @@ copy_button.addEventListener('click', () => { function setData(mode) { localStorage.setItem('/cache/modal/error_history/state', mode) + return mode } \ No newline at end of file diff --git a/webroot/js/modal/language.js b/webroot/js/modal/language.js index bca23e0..a77ec57 100644 --- a/webroot/js/modal/language.js +++ b/webroot/js/modal/language.js @@ -19,5 +19,6 @@ close_button.addEventListener('click', () => { function setData(mode) { localStorage.setItem('/cache/modal/language/state', mode) + return mode } \ No newline at end of file diff --git a/webroot/js/navbar.js b/webroot/js/navbar.js index 22c67df..aeb0f3e 100644 --- a/webroot/js/navbar.js +++ b/webroot/js/navbar.js @@ -1,16 +1,13 @@ setData('home') -document.getElementById(`ni_home`).style.display = 'flex' -document.getElementById(`nid_home`).style.display = 'none' -document.getElementById(`panel_home`).style.display = 'block' +document.getElementById('ni_home').style.display = 'flex' +document.getElementById('nid_home').style.display = 'none' +document.getElementById('panel_home').style.display = 'block' -document.querySelectorAll("[name=navbutton]").forEach((element) => { +document.querySelectorAll('[name=navbutton]').forEach((element) => { element.addEventListener('click', (e) => { const value = e.target.value - let previous = - !localStorage.getItem('/cache/navbar/previous') - ? setData('home') - : localStorage.getItem('/cache/navbar/previous') - if (previous === value) return + const previous = !localStorage.getItem('/cache/navbar/previous') ? setData('home') : localStorage.getItem('/cache/navbar/previous') + if (previous === value) return; /* INFO: Disable icon on old state */ const pre_input = document.getElementById(`n_${previous}`) @@ -31,11 +28,13 @@ document.querySelectorAll("[name=navbutton]").forEach((element) => { curr_input.setAttribute('checked', '') icon.style.display = 'flex' icon_disabled.style.display = 'none' + setData(value) }) }) function setData(data) { localStorage.setItem('/cache/navbar/previous', data) + return data } \ No newline at end of file diff --git a/webroot/js/switcher/fontChanger.js b/webroot/js/switcher/fontChanger.js index 94cf4dc..40b1c06 100644 --- a/webroot/js/switcher/fontChanger.js +++ b/webroot/js/switcher/fontChanger.js @@ -5,29 +5,30 @@ let sys_font = localStorage.getItem('/system/font') if (!sys_font) sys_font = setData('false') if (sys_font === 'true') { switcher.setAttribute('checked', '') + setSystemFont() } switcher.addEventListener('click', () => { sys_font = setData(String(switcher.checked)) - switcher.checked - ? setSystemFont() - : document.getElementById('font-tag').remove() + + switcher.checked ? setSystemFont() : document.getElementById('font-tag').remove() }) function setSystemFont() { const headTag = document.getElementsByTagName('head')[0] - const styleTag = document.createElement("style") + const styleTag = document.createElement('style') + styleTag.id = 'font-tag' - headTag.appendChild(styleTag); + headTag.appendChild(styleTag) styleTag.innerHTML = ` :root { --font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif - } - `; + }` } function setData(mode) { localStorage.setItem('/system/font', mode) + return mode } \ No newline at end of file diff --git a/webroot/js/theme.js b/webroot/js/theme.js index 88e4963..dec5824 100644 --- a/webroot/js/theme.js +++ b/webroot/js/theme.js @@ -1,5 +1,5 @@ -import { setDark } from "./themes/dark.js" -import { setLight } from "./themes/light.js" +import { setDark } from './themes/dark.js' +import { setLight } from './themes/light.js' const button = document.getElementById('theme_switcher') @@ -8,13 +8,12 @@ if (!sys_theme) sys_theme = setData('dark') if (sys_theme === 'light') { button.setAttribute('checked', '') + setLight() } button.addEventListener('click', () => { - button.checked - ? setLight() - : setDark() + button.checked ? setLight() : setDark() }) function setData(mode) { diff --git a/webroot/js/themes/dark.js b/webroot/js/themes/dark.js index 9ded822..fcbd4c3 100644 --- a/webroot/js/themes/dark.js +++ b/webroot/js/themes/dark.js @@ -1,4 +1,4 @@ -import { setDarkNav } from "./darkNavbar.js" +import { setDarkNav } from './darkNavbar.js' const rootCss = document.querySelector(':root') @@ -7,7 +7,6 @@ const close_icons = document.getElementsByClassName('close_icon') const expand_icons = document.getElementsByClassName('expander') const copy_button = document.getElementById('errorh_copy') - export function setDark() { rootCss.style.setProperty('--background', '#181c20') rootCss.style.setProperty('--font', '#ffffff') @@ -34,5 +33,6 @@ export function setDark() { function setData(mode) { localStorage.setItem('/system/theme', mode) + return mode } \ No newline at end of file diff --git a/webroot/js/themes/darkNavbar.js b/webroot/js/themes/darkNavbar.js index bcfec68..4161082 100644 --- a/webroot/js/themes/darkNavbar.js +++ b/webroot/js/themes/darkNavbar.js @@ -1,22 +1,13 @@ export function setDarkNav() { - document.getElementById('nid_home').innerHTML - = '' - document.getElementById('ni_home').innerHTML - = '' + document.getElementById('nid_home').innerHTML = '' + document.getElementById('ni_home').innerHTML = '' - document.getElementById('nid_modules').innerHTML - = '' - document.getElementById('ni_modules').innerHTML - = '' + document.getElementById('nid_modules').innerHTML = '' + document.getElementById('ni_modules').innerHTML = '' - document.getElementById('nid_actions').innerHTML - = '' - document.getElementById('ni_actions').innerHTML - = '' + document.getElementById('nid_actions').innerHTML = '' + document.getElementById('ni_actions').innerHTML = '' - document.getElementById('nid_settings').innerHTML - = '' - document.getElementById('ni_settings').innerHTML - = '' - return + document.getElementById('nid_settings').innerHTML = '' + document.getElementById('ni_settings').innerHTML = '' } \ No newline at end of file diff --git a/webroot/js/themes/light.js b/webroot/js/themes/light.js index a4d8b40..1c77d81 100644 --- a/webroot/js/themes/light.js +++ b/webroot/js/themes/light.js @@ -2,8 +2,8 @@ import { light_close_icon, light_expand_icon, light_copy_icon, -} from "./lightIcon.js" -import { setLightNav } from "./lightNavbar.js" +} from './lightIcon.js' +import { setLightNav } from './lightNavbar.js' const rootCss = document.querySelector(':root') /* INFO: Changes the icons to match the theme */ @@ -37,5 +37,6 @@ export function setLight() { function setData(mode) { localStorage.setItem('/system/theme', mode) + return mode } \ No newline at end of file diff --git a/webroot/js/themes/lightNavbar.js b/webroot/js/themes/lightNavbar.js index 57424c5..1aa8a21 100644 --- a/webroot/js/themes/lightNavbar.js +++ b/webroot/js/themes/lightNavbar.js @@ -12,5 +12,4 @@ export function setLightNav() { document.getElementById('nid_settings').innerHTML = light_settings_icon() document.getElementById('ni_settings').innerHTML = light_settings_icon(true) - return } \ No newline at end of file diff --git a/webroot/js/translate/action.js b/webroot/js/translate/action.js index 554b1b3..7752b91 100644 --- a/webroot/js/translate/action.js +++ b/webroot/js/translate/action.js @@ -1,25 +1,18 @@ export function translateActionPage(new_translations) { /* INFO: action card */ - document.getElementById('panel_actions_header').innerHTML - = new_translations.page.action.header + document.getElementById('panel_actions_header').innerHTML = new_translations.page.action.header /* INFO: daemon32 small card */ if (document.getElementById('daemon32_stop_button')) { /* INFO: Not all devices have 32-bit support */ - document.getElementById('daemon32_stop_button').innerHTML - = new_translations.page.action.daemonButton.stop - document.getElementById('daemon32_start_button').innerHTML - = new_translations.page.action.daemonButton.start - document.getElementById('daemon32_exit_button').innerHTML - = new_translations.page.action.daemonButton.exit + document.getElementById('daemon32_stop_button').innerHTML = new_translations.page.action.daemonButton.stop + document.getElementById('daemon32_start_button').innerHTML = new_translations.page.action.daemonButton.start + document.getElementById('daemon32_exit_button').innerHTML = new_translations.page.action.daemonButton.exit } /* INFO: daemon64 small card */ if (document.getElementById('daemon64_stop_button')) { /* INFO: Not all devices have 64-bit support */ - document.getElementById('daemon64_stop_button').innerHTML - = new_translations.page.action.daemonButton.stop - document.getElementById('daemon64_start_button').innerHTML - = new_translations.page.action.daemonButton.start - document.getElementById('daemon64_exit_button').innerHTML - = new_translations.page.action.daemonButton.exit + document.getElementById('daemon64_stop_button').innerHTML = new_translations.page.action.daemonButton.stop + document.getElementById('daemon64_start_button').innerHTML = new_translations.page.action.daemonButton.start + document.getElementById('daemon64_exit_button').innerHTML = new_translations.page.action.daemonButton.exit } } \ No newline at end of file diff --git a/webroot/js/translate/home.js b/webroot/js/translate/home.js index ff984d8..a55bda0 100644 --- a/webroot/js/translate/home.js +++ b/webroot/js/translate/home.js @@ -4,7 +4,7 @@ export function translateHomePage(old_translations, new_translations) { const zygote32_status_div = document.getElementById('zygote32_status') const zygote64_status_div = document.getElementById('zygote64_status') - switch (rezygisk_state.innerHTML.replace(/(\r\n|\n|\r)/gm,"").trim()) { + switch (rezygisk_state.innerHTML.replace(/(\r\n|\n|\r)/gm, '').trim()) { case old_translations.page.home.status.ok: { rezygisk_state.innerHTML = new_translations.page.home.status.ok @@ -28,22 +28,19 @@ export function translateHomePage(old_translations, new_translations) { } if (zygote32_status_div) { - switch (zygote32_status_div.innerHTML.replace(/(\r\n|\n|\r)/gm,"").trim()) { + switch (zygote32_status_div.innerHTML.replace(/(\r\n|\n|\r)/gm, '').trim()) { case old_translations.page.home.info.zygote.injected: { - zygote32_status_div.innerHTML - = new_translations.page.home.info.zygote.injected + zygote32_status_div.innerHTML = new_translations.page.home.info.zygote.injected break } case old_translations.page.home.info.zygote.notInjected: { - zygote32_status_div.innerHTML - = new_translations.page.home.info.zygote.notInjected + zygote32_status_div.innerHTML = new_translations.page.home.info.zygote.notInjected break } case old_translations.page.home.info.zygote.unknown: { - zygote32_status_div.innerHTML - = new_translations.page.home.info.zygote.unknown + zygote32_status_div.innerHTML = new_translations.page.home.info.zygote.unknown break } @@ -51,22 +48,19 @@ export function translateHomePage(old_translations, new_translations) { } if (zygote64_status_div) { - switch (zygote64_status_div.innerHTML.replace(/(\r\n|\n|\r)/gm,"").trim()) { + switch (zygote64_status_div.innerHTML.replace(/(\r\n|\n|\r)/gm, '').trim()) { case old_translations.page.home.info.zygote.injected: { - zygote64_status_div.innerHTML - = new_translations.page.home.info.zygote.injected + zygote64_status_div.innerHTML = new_translations.page.home.info.zygote.injected break } case old_translations.page.home.info.zygote.notInjected: { - zygote64_status_div.innerHTML - = new_translations.page.home.info.zygote.notInjected + zygote64_status_div.innerHTML = new_translations.page.home.info.zygote.notInjected break } case old_translations.page.home.info.zygote.unknown: { - zygote64_status_div.innerHTML - = new_translations.page.home.info.zygote.unknown + zygote64_status_div.innerHTML = new_translations.page.home.info.zygote.unknown break } @@ -74,16 +68,15 @@ export function translateHomePage(old_translations, new_translations) { } /* INFO: info card */ - document.getElementById('version_info_title').innerHTML - = new_translations.page.home.info.version - document.getElementById('root_info_title').innerHTML - = new_translations.page.home.info.root + document.getElementById('version_info_title').innerHTML = new_translations.page.home.info.version + document.getElementById('root_info_title').innerHTML = new_translations.page.home.info.root const version_code = document.getElementById('version_code') const root_impl = document.getElementById('root_impl') - if (version_code.innerHTML.replace(/(\r\n|\n|\r)/gm,"").trim() === old_translations.global.unknown) + if (version_code.innerHTML.replace(/(\r\n|\n|\r)/gm, '').trim() === old_translations.global.unknown) version_code.innerHTML = new_translations.global.unknown - if (root_impl.innerHTML.replace(/(\r\n|\n|\r)/gm,"").trim() === old_translations.global.unknown) + + if (root_impl.innerHTML.replace(/(\r\n|\n|\r)/gm, '').trim() === old_translations.global.unknown) root_impl.innerHTML = new_translations.global.unknown } \ No newline at end of file diff --git a/webroot/js/translate/modules.js b/webroot/js/translate/modules.js index e10a5be..7a6136a 100644 --- a/webroot/js/translate/modules.js +++ b/webroot/js/translate/modules.js @@ -1,6 +1,6 @@ export function translateModulesPage(new_translations) { - document.getElementById('panel_modules_header').innerHTML - = new_translations.page.modules.header + document.getElementById('panel_modules_header').innerHTML = new_translations.page.modules.header + /* INFO: arch type */ const module_element_arch = document.getElementsByClassName('arch_desc') for (const module of module_element_arch) { diff --git a/webroot/js/translate/settings.js b/webroot/js/translate/settings.js index 43f43aa..77fe6c9 100644 --- a/webroot/js/translate/settings.js +++ b/webroot/js/translate/settings.js @@ -1,28 +1,19 @@ export function translateSettingsPage(new_translations) { - document.getElementById('panel_settings_header').innerHTML - = new_translations.page.settings.header + document.getElementById('panel_settings_header').innerHTML = new_translations.page.settings.header /* INFO: Change font option */ - document.getElementById('sys_font_option_title').innerHTML - = new_translations.page.settings.font.header - document.getElementById('sys_font_option_desc').innerHTML - = new_translations.page.settings.font.description + document.getElementById('sys_font_option_title').innerHTML = new_translations.page.settings.font.header + document.getElementById('sys_font_option_desc').innerHTML = new_translations.page.settings.font.description /* INFO: Change font option */ - document.getElementById('sys_theme_option_title').innerHTML - = new_translations.page.settings.theme.header - document.getElementById('sys_theme_option_desc').innerHTML - = new_translations.page.settings.theme.description + document.getElementById('sys_theme_option_title').innerHTML = new_translations.page.settings.theme.header + document.getElementById('sys_theme_option_desc').innerHTML = new_translations.page.settings.theme.description /* INFO: Change font option */ - document.getElementById('sys_lang_option_title').innerHTML - = new_translations.page.settings.language.header - document.getElementById('sys_lang_option_desc').innerHTML - = new_translations.page.settings.language.description + document.getElementById('sys_lang_option_title').innerHTML = new_translations.page.settings.language.header + document.getElementById('sys_lang_option_desc').innerHTML = new_translations.page.settings.language.description /* INFO: Change font option */ - document.getElementById('sys_errorh_title').innerHTML - = new_translations.page.settings.logs.header - document.getElementById('sys_errorh_desc').innerHTML - = new_translations.page.settings.logs.description + document.getElementById('sys_errorh_title').innerHTML = new_translations.page.settings.logs.header + document.getElementById('sys_errorh_desc').innerHTML = new_translations.page.settings.logs.description } \ No newline at end of file