From 9ef5f2700dd12fc7bfa1c6ac1c4f7cedcf2a52f3 Mon Sep 17 00:00:00 2001
From: Patrick O'Carroll <ocarroll.patrick@gmail.com>
Date: Thu, 29 Mar 2018 15:02:00 +0200
Subject: [PATCH] timepicker now closes without exiting edit/view mode, close
 order: modal, timepicker, view

---
 public/app/core/services/keybindingSrv.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts
index 829a3415cc1..e51c0477ffa 100644
--- a/public/app/core/services/keybindingSrv.ts
+++ b/public/app/core/services/keybindingSrv.ts
@@ -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;
     }