|
@@ -150,6 +150,9 @@ export function grafanaAppDirective(playlistSrv) {
|
|
|
scope.$watch('contextSrv.sidemenu', newVal => {
|
|
scope.$watch('contextSrv.sidemenu', newVal => {
|
|
|
if (newVal !== undefined) {
|
|
if (newVal !== undefined) {
|
|
|
elem.toggleClass('sidemenu-open', scope.contextSrv.sidemenu);
|
|
elem.toggleClass('sidemenu-open', scope.contextSrv.sidemenu);
|
|
|
|
|
+ if (!newVal) {
|
|
|
|
|
+ scope.contextSrv.setPinnedState(false);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
if (scope.contextSrv.sidemenu) {
|
|
if (scope.contextSrv.sidemenu) {
|
|
|
ignoreSideMenuHide = true;
|
|
ignoreSideMenuHide = true;
|
|
@@ -159,6 +162,12 @@ export function grafanaAppDirective(playlistSrv) {
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
|
|
+ scope.$watch('contextSrv.pinned', newVal => {
|
|
|
|
|
+ if (newVal !== undefined) {
|
|
|
|
|
+ elem.toggleClass('sidemenu-pinned', newVal);
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+
|
|
|
// tooltip removal fix
|
|
// tooltip removal fix
|
|
|
scope.$on("$routeChangeSuccess", function() {
|
|
scope.$on("$routeChangeSuccess", function() {
|
|
|
$("#tooltip, .tooltip").remove();
|
|
$("#tooltip, .tooltip").remove();
|
|
@@ -182,7 +191,7 @@ export function grafanaAppDirective(playlistSrv) {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
// hide sidemenu
|
|
// hide sidemenu
|
|
|
- if (!ignoreSideMenuHide && elem.find('.sidemenu').length > 0) {
|
|
|
|
|
|
|
+ if (!ignoreSideMenuHide && !scope.contextSrv.pinned && elem.find('.sidemenu').length > 0) {
|
|
|
if (target.parents('.sidemenu').length === 0) {
|
|
if (target.parents('.sidemenu').length === 0) {
|
|
|
scope.$apply(() => scope.contextSrv.toggleSideMenu());
|
|
scope.$apply(() => scope.contextSrv.toggleSideMenu());
|
|
|
}
|
|
}
|