IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(graph): fixed for graph series color selector popover, broken in recent 3.0-pre1 build, fixes #3774

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-01-18 12:12:05 +01:00
parent 30c19d525e
commit edcef7d078
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/core/components/grafana_app.ts
View File

@ -165,22 +165,30 @@ export function grafanaAppDirective() {
// handle document clicks that should hide things
elem.click(function(evt) {
if ($(evt.target).parents().length === 0) {
var target = $(evt.target);
if (target.parents().length === 0) {
return;
}
// hide search
if (elem.find('.search-container').length > 0) {
if ($(evt.target).parents('.search-container').length === 0) {
if (target.parents('.search-container').length === 0) {
scope.appEvent('hide-dash-search');
}
}
// hide sidemenu
if (!ignoreSideMenuHide && elem.find('.sidemenu').length > 0) {
if ($(evt.target).parents('.sidemenu').length === 0) {
if (target.parents('.sidemenu').length === 0) {
scope.$apply(() => scope.contextSrv.toggleSideMenu());
}
}
// hide popovers
var popover = elem.find('.popover');
console.log(target.parents('.graph-legend').length);
if (popover.length > 0 && target.parents('.graph-legend').length === 0) {
popover.hide();
}
});
}
};

2
public/app/plugins/panel/graph/legend.js
View File

@ -45,7 +45,7 @@ function (angular, _, $) {
popoverScope.series = seriesInfo;
popoverSrv.show({
element: el,
templateUrl: 'app/plugins/panels/graph/legend.popover.html',
templateUrl: 'app/plugins/panel/graph/legend.popover.html',
scope: popoverScope
});
}