From 8195c085fa2a095fe753f725663ff7217cc14365 Mon Sep 17 00:00:00 2001
From: Patrick O'Carroll <ocarroll.patrick@gmail.com>
Date: Thu, 29 Mar 2018 09:15:15 +0200
Subject: [PATCH] bounnd the esc key to exit timepicker

---
 public/app/core/services/keybindingSrv.ts              | 7 +++++++
 public/app/features/dashboard/timepicker/timepicker.ts | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts
index 0d468b6980f..829a3415cc1 100644
--- a/public/app/core/services/keybindingSrv.ts
+++ b/public/app/core/services/keybindingSrv.ts
@@ -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 {
diff --git a/public/app/features/dashboard/timepicker/timepicker.ts b/public/app/features/dashboard/timepicker/timepicker.ts
index 2434e691515..19c3db7f6d3 100644
--- a/public/app/features/dashboard/timepicker/timepicker.ts
+++ b/public/app/features/dashboard/timepicker/timepicker.ts
@@ -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);