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

Merge branch 'v4.4.x'

Browse Source
This commit is contained in:
Daniel Lee
2017-08-07 10:47:23 +02:00
parent d285045ff6 0d25357367
commit 649fe7e462
6 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/core/services/keybindingSrv.ts
View File

@@ -214,12 +214,8 @@ export class KeybindingSrv {
if (popups.length > 0) {
return;
}
// close modals
var modalData = $(".modal").data();
if (modalData && modalData.$scope && modalData.$scope.dismiss) {
modalData.$scope.dismiss();
}
scope.appEvent('hide-modal');
scope.appEvent('hide-dash-editor');
scope.appEvent('panel-change-view', {fullscreen: false, edit: false});
});