From 98e1404fed0a1cab9cdc6f7404d805459f374f48 Mon Sep 17 00:00:00 2001
From: Patrick O'Carroll <ocarroll.patrick@gmail.com>
Date: Tue, 3 Apr 2018 09:39:46 +0200
Subject: [PATCH] added if to onAppevent, renamed appevent, add appevent to
 applyCustom and setRelativeFilter

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

diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts
index e51c0477ffa..35cd7808d12 100644
--- a/public/app/core/services/keybindingSrv.ts
+++ b/public/app/core/services/keybindingSrv.ts
@@ -23,7 +23,13 @@ export class KeybindingSrv {
 
     this.setupGlobal();
     appEvents.on('show-modal', () => (this.modalOpen = true));
-    $rootScope.onAppEvent('openTimepicker', () => (this.timepickerOpen = true));
+    $rootScope.onAppEvent('escTimepicker', () => {
+      if (!this.timepickerOpen) {
+        this.timepickerOpen = true;
+      } else {
+        this.timepickerOpen = false;
+      }
+    });
   }
 
   setupGlobal() {
diff --git a/public/app/features/dashboard/timepicker/timepicker.ts b/public/app/features/dashboard/timepicker/timepicker.ts
index 19c3db7f6d3..32ce07e4468 100644
--- a/public/app/features/dashboard/timepicker/timepicker.ts
+++ b/public/app/features/dashboard/timepicker/timepicker.ts
@@ -96,13 +96,12 @@ export class TimePickerCtrl {
   }
 
   openDropdown() {
+    this.$rootScope.appEvent('escTimepicker');
     if (this.isOpen) {
       this.isOpen = false;
       return;
     }
 
-    this.$rootScope.appEvent('openTimepicker');
-
     this.onRefresh();
     this.editTimeRaw = this.timeRaw;
     this.timeOptions = rangeUtil.getRelativeTimesList(this.panel, this.rangeString);
@@ -118,6 +117,7 @@ export class TimePickerCtrl {
   }
 
   applyCustom() {
+    this.$rootScope.appEvent('escTimepicker');
     if (this.refresh.value !== this.dashboard.refresh) {
       this.timeSrv.setAutoRefresh(this.refresh.value);
     }
@@ -139,6 +139,7 @@ export class TimePickerCtrl {
   }
 
   setRelativeFilter(timespan) {
+    this.$rootScope.appEvent('escTimepicker');
     var range = { from: timespan.from, to: timespan.to };
 
     if (this.panel.nowDelay && range.to === 'now') {