diff --git a/VERSION.properties b/VERSION.properties index d0a8f27c..9606eb17 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.19.35 +client.version=1.19.36 server.version=1.15.0 diff --git a/shine-UI/js/pages/network-version-switcher.js b/shine-UI/js/pages/network-version-switcher.js index ca788739..2db396b0 100644 --- a/shine-UI/js/pages/network-version-switcher.js +++ b/shine-UI/js/pages/network-version-switcher.js @@ -49,9 +49,24 @@ export function render(context = {}) { const implementation = mode === 'legacy' ? legacyNetworkView : modernNetworkView; const screen = implementation.render(context); screen.classList.add(`network-screen--${mode}`); - const switcher = createModeSwitcher(mode, context.navigate); - const topbarLeft = document.querySelector('#topbar-slot .topbar__left'); - if (topbarLeft) topbarLeft.append(switcher); - else screen.prepend(switcher); + + const attachSwitcher = () => { + const topbarLeft = document.querySelector('#topbar-slot .topbar__left'); + if (!topbarLeft || topbarLeft.querySelector('.network-version-switcher')) return; + topbarLeft.append(createModeSwitcher(mode, context.navigate)); + }; + attachSwitcher(); + + const topbarSlot = document.getElementById('topbar-slot'); + const observer = typeof MutationObserver === 'function' && topbarSlot + ? new MutationObserver(attachSwitcher) + : null; + observer?.observe(topbarSlot, { childList: true, subtree: true }); + + const pageCleanup = screen.cleanup; + screen.cleanup = () => { + observer?.disconnect(); + pageCleanup?.(); + }; return screen; }