diff --git a/src/components/dialogHelper/dialogHelper.js b/src/components/dialogHelper/dialogHelper.js index 5617f2a170..8a6a22fd15 100644 --- a/src/components/dialogHelper/dialogHelper.js +++ b/src/components/dialogHelper/dialogHelper.js @@ -87,7 +87,7 @@ import '../../assets/css/scrollstyles.scss'; if (!self.closedByBack && isHistoryEnabled(dlg)) { const state = window.history.state || {}; if (state.dialogId === hash) { - window.history.back(); + appRouter.back(); } } @@ -142,7 +142,7 @@ import '../../assets/css/scrollstyles.scss'; animateDialogOpen(dlg); if (isHistoryEnabled(dlg)) { - appRouter.show('/dialog', { dialogId: hash }); + appRouter.show(`/dialog?dlg=${hash}`, { dialogId: hash }); window.addEventListener('popstate', onHashChange); } else { @@ -213,7 +213,7 @@ import '../../assets/css/scrollstyles.scss'; export function close(dlg) { if (isOpened(dlg)) { if (isHistoryEnabled(dlg)) { - window.history.back(); + appRouter.back(); } else { closeDialog(dlg); } diff --git a/src/components/syncPlay/ui/groupSelectionMenu.js b/src/components/syncPlay/ui/groupSelectionMenu.js index 86632704fb..809c2cbd5a 100644 --- a/src/components/syncPlay/ui/groupSelectionMenu.js +++ b/src/components/syncPlay/ui/groupSelectionMenu.js @@ -63,7 +63,6 @@ class GroupSelectionMenu { title: globalize.translate('HeaderSyncPlaySelectGroup'), items: menuItems, positionTo: button, - resolveOnClick: true, border: true }; @@ -142,7 +141,6 @@ class GroupSelectionMenu { title: groupInfo.GroupName, items: menuItems, positionTo: button, - resolveOnClick: true, border: true };