Commit 92ec8757 by Johannes Schill

fix: Kiosk mode should have &kiosk appended to the url #15765

parent c3604767
...@@ -75,7 +75,7 @@ export class GrafanaCtrl { ...@@ -75,7 +75,7 @@ export class GrafanaCtrl {
} }
} }
function setViewModeBodyClass(body, mode: KioskUrlValue, sidemenuOpen: boolean) { function setViewModeBodyClass(body: JQuery, mode: KioskUrlValue, sidemenuOpen: boolean) {
body.removeClass('view-mode--tv'); body.removeClass('view-mode--tv');
body.removeClass('view-mode--kiosk'); body.removeClass('view-mode--kiosk');
body.removeClass('view-mode--inactive'); body.removeClass('view-mode--inactive');
...@@ -174,8 +174,8 @@ export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScop ...@@ -174,8 +174,8 @@ export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScop
}); });
// handle kiosk mode // handle kiosk mode
appEvents.on('toggle-kiosk-mode', options => { appEvents.on('toggle-kiosk-mode', (options: { exit?: boolean }) => {
const search = $location.search(); const search: { kiosk?: KioskUrlValue } = $location.search();
if (options && options.exit) { if (options && options.exit) {
search.kiosk = '1'; search.kiosk = '1';
...@@ -197,7 +197,7 @@ export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScop ...@@ -197,7 +197,7 @@ export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScop
} }
} }
$location.search(search); $timeout(() => $location.search(search));
setViewModeBodyClass(body, search.kiosk, sidemenuOpen); setViewModeBodyClass(body, search.kiosk, sidemenuOpen);
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment