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

timepicker now closes without exiting edit/view mode, close order: modal, timepicker, view

Browse Source
This commit is contained in:
Patrick O'Carroll 2018-03-29 15:02:00 +02:00
parent 8195c085fa
commit 9ef5f2700d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,13 +74,13 @@ export class KeybindingSrv {
appEvents.emit('hide-modal');
if (this.timepickerOpen === true) {
this.$rootScope.appEvent('closeTimepicker');
this.timepickerOpen = false;
}
if (!this.modalOpen) {
this.$rootScope.appEvent('panel-change-view', { fullscreen: false, edit: false });
if (this.timepickerOpen) {
this.$rootScope.appEvent('closeTimepicker');
this.timepickerOpen = false;
} else {
this.$rootScope.appEvent('panel-change-view', { fullscreen: false, edit: false });
}
} else {
this.modalOpen = false;
}