IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-25 18:30:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

bounnd the esc key to exit timepicker

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

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

@ -10,6 +10,7 @@ import 'mousetrap-global-bind';
export class KeybindingSrv {
helpModal: boolean;
modalOpen = false;
timepickerOpen = false;
/** @ngInject */
constructor(private $rootScope, private $location) {
@ -22,6 +23,7 @@ export class KeybindingSrv {
this.setupGlobal();
appEvents.on('show-modal', () => (this.modalOpen = true));
$rootScope.onAppEvent('openTimepicker', () => (this.timepickerOpen = true));
}
setupGlobal() {
@ -72,6 +74,11 @@ 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 });
} else {

3
public/app/features/dashboard/timepicker/timepicker.ts
View File

@ -32,6 +32,7 @@ export class TimePickerCtrl {
$rootScope.onAppEvent('shift-time-forward', () => this.move(1), $scope);
$rootScope.onAppEvent('shift-time-backward', () => this.move(-1), $scope);
$rootScope.onAppEvent('refresh', this.onRefresh.bind(this), $scope);
$rootScope.onAppEvent('closeTimepicker', this.openDropdown.bind(this), $scope);
// init options
this.panel = this.dashboard.timepicker;
@ -100,6 +101,8 @@ export class TimePickerCtrl {
return;
}
this.$rootScope.appEvent('openTimepicker');
this.onRefresh();
this.editTimeRaw = this.timeRaw;
this.timeOptions = rangeUtil.getRelativeTimesList(this.panel, this.rangeString);