From c1818b6ba226b0a6c413862fd6a247ea24ec3db1 Mon Sep 17 00:00:00 2001 From: KOWX712 Date: Fri, 3 Jan 2025 14:47:58 +0800 Subject: [PATCH] remove ripple effect on mode menu --- module/webui/scripts/applist.js | 3 +++ module/webui/scripts/main.js | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/module/webui/scripts/applist.js b/module/webui/scripts/applist.js index f1f978a..302a076 100644 --- a/module/webui/scripts/applist.js +++ b/module/webui/scripts/applist.js @@ -4,6 +4,7 @@ const appTemplate = document.getElementById('app-template').content; const modeOverlay = document.querySelector('.mode-overlay'); export const appListContainer = document.getElementById('apps-list'); export const updateCard = document.getElementById('update-card'); +export let modeActive = false; // Fetch and render applist export async function fetchAppList() { @@ -197,6 +198,7 @@ function setupModeMenu() { function showMode(card) { const modeElement = card.querySelector(".mode"); if (modeElement) { + modeActive = true; modeElement.style.display = "flex"; modeOverlay.style.display = "flex"; setTimeout(() => { @@ -207,6 +209,7 @@ function setupModeMenu() { function hideAllModes() { const allModeElements = appListContainer.querySelectorAll(".mode"); allModeElements.forEach((modeElement) => { + modeActive = false; modeElement.classList.remove('show'); modeOverlay.style.display = "none"; setTimeout(() => { diff --git a/module/webui/scripts/main.js b/module/webui/scripts/main.js index 53d00ca..08e5922 100644 --- a/module/webui/scripts/main.js +++ b/module/webui/scripts/main.js @@ -1,4 +1,4 @@ -import { appListContainer, fetchAppList } from './applist.js'; +import { appListContainer, fetchAppList, modeActive } from './applist.js'; import { initializeAvailableLanguages, detectUserLanguage, loadTranslations, setupLanguageMenu, translations } from './language.js'; import { aospkb } from './menu_option.js'; import { searchMenuContainer, searchInput, clearBtn, setupMenuToggle } from './search_menu.js'; @@ -19,7 +19,7 @@ export const basePath = "set-path"; export const appsWithExclamation = []; export const appsWithQuestion = []; const ADDITIONAL_APPS = [ "com.google.android.gms", "io.github.vvb2060.keyattestation", "io.github.vvb2060.mahoshojo", "icu.nullptr.nativetest" ]; -const rippleClasses = ['.language-option', '.menu-button', '.menu-options li', '.search-card', '.card', '.update-card', '.link-icon', '.floating-btn', '.uninstall-container', '.boot-hash-save-button', '.boot-hash-value', '.status-indicator', '.reboot', '.install']; +const rippleClasses = ['.language-option', '.menu-button', '.menu-options li', '.search-card', '.card', '.update-card', '.link-icon', '.floating-btn', '.uninstall-container', '.boot-hash-save-button', '.boot-hash-value', '.reboot', '.install']; // Variables let e = 0; @@ -189,6 +189,7 @@ function applyRippleEffect() { document.querySelectorAll(selector).forEach(element => { element.addEventListener("pointerdown", function (event) { if (isScrolling) return; + if (modeActive) return; const ripple = document.createElement("span"); ripple.classList.add("ripple");