diff --git a/src/Logic/Web/ThemeViewStateHashActor.ts b/src/Logic/Web/ThemeViewStateHashActor.ts index 817d7173a..250eecd8d 100644 --- a/src/Logic/Web/ThemeViewStateHashActor.ts +++ b/src/Logic/Web/ThemeViewStateHashActor.ts @@ -17,7 +17,7 @@ export default class ThemeViewStateHashActor { "The possible hashes are:", "", MenuState._menuviewTabs.map((tab) => "`menu:" + tab + "`").join(","), - MenuState._themeviewTabs.map((tab) => "`theme-menu:" + tab + "`").join(","), + MenuState._themeviewTabs.map((tab) => "`theme-menu:" + tab + "`").join(",") ] /** @@ -120,27 +120,30 @@ export default class ThemeViewStateHashActor { private loadStateFromHash(hash: string) { const state = this._state - const parts = hash.split(":") - outer: for (const { toggle, name, submenu } of state.guistate.allToggles) { - for (const part of parts) { - if (part === name) { + for (const superpart of hash.split(";")) { + const parts = superpart.at(-1)?.split(":") ?? [] + + outer: for (const { toggle, name, submenu } of state.guistate.allToggles) { + for (const part of parts) { + if (part.indexOf(":") < 0) { + if (part === name) { + toggle.setData(true) + continue outer + } + continue + } + const [main, submenuValue] = part.split(":") + if (part !== main) { + continue + } toggle.setData(true) + submenu?.setData(submenuValue) continue outer } - if (part.indexOf(":") < 0) { - continue - } - const [main, submenuValue] = part.split(":") - if (part !== main) { - continue - } - toggle.setData(true) - submenu?.setData(submenuValue) - continue outer - } - // If we arrive here, the loop above has not found any match - toggle.setData(false) + // If we arrive here, the loop above has not found any match + toggle.setData(false) + } } } diff --git a/src/UI/BigComponents/CopyrightPanel.svelte b/src/UI/BigComponents/CopyrightPanel.svelte index 6072a56f0..69b4cb2f8 100644 --- a/src/UI/BigComponents/CopyrightPanel.svelte +++ b/src/UI/BigComponents/CopyrightPanel.svelte @@ -13,11 +13,10 @@ import ContributorCount from "../../Logic/ContributorCount" import BaseUIElement from "../BaseUIElement" import Github from "../../assets/svg/Github.svelte" - import { DatabaseIcon, TranslateIcon } from "@rgossiaux/svelte-heroicons/solid" + import { TranslateIcon } from "@rgossiaux/svelte-heroicons/solid" import Osm_logo from "../../assets/svg/Osm_logo.svelte" import Generic_map from "../../assets/svg/Generic_map.svelte" - import { PencilIcon, UserGroupIcon, UsersIcon } from "@babeard/svelte-heroicons/solid" - import Loading from "../Base/Loading.svelte" + import { UserGroupIcon} from "@babeard/svelte-heroicons/solid" import Marker from "../Map/Marker.svelte" export let state: SpecialVisualizationState diff --git a/src/UI/ThemeViewGUI.svelte b/src/UI/ThemeViewGUI.svelte index 0b3528bae..d36450093 100644 --- a/src/UI/ThemeViewGUI.svelte +++ b/src/UI/ThemeViewGUI.svelte @@ -46,7 +46,6 @@ import PendingChangesIndicator from "./BigComponents/PendingChangesIndicator.svelte" import Cross from "../assets/svg/Cross.svelte" import LanguagePicker from "./InputElement/LanguagePicker.svelte" - import Bug from "../assets/svg/Bug.svelte" import Min from "../assets/svg/Min.svelte" import Plus from "../assets/svg/Plus.svelte" import Filter from "../assets/svg/Filter.svelte" @@ -645,7 +644,7 @@ - state.guistate.privacyPanelIsOpened.setData(false)}> + state.guistate.copyrightPanelIsOpened.setData(false)}>

@@ -655,7 +654,7 @@

- new CopyrightPanel(state)} /> +