From f3845389593824754dc37d20cd6b4235186f3628 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 26 Jan 2016 23:18:10 +0100 Subject: [PATCH] fix(search): fixes broken esc button in search --- public/app/core/components/search/search.ts | 7 +++++-- public/app/features/dashboard/directives/dashSearchView.js | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/public/app/core/components/search/search.ts b/public/app/core/components/search/search.ts index 39c8686bbe3..7a92a2f18a1 100644 --- a/public/app/core/components/search/search.ts +++ b/public/app/core/components/search/search.ts @@ -14,6 +14,7 @@ export class SearchCtrl { currentSearchId: number; tagsMode: boolean; showImport: boolean; + dismiss: any; /** @ngInject */ constructor(private $scope, private $location, private $timeout, private backendSrv, private contextSrv) { @@ -32,7 +33,7 @@ export class SearchCtrl { keyDown(evt) { if (evt.keyCode === 27) { - this.$scope.dismiss(); + this.dismiss(); } if (evt.keyCode === 40) { this.moveSelection(1); @@ -137,7 +138,9 @@ export function searchDirective() { controller: SearchCtrl, bindToController: true, controllerAs: 'ctrl', - scope: {}, + scope: { + dismiss: '&' + }, }; } diff --git a/public/app/features/dashboard/directives/dashSearchView.js b/public/app/features/dashboard/directives/dashSearchView.js index cbc38a98901..cee97fee758 100644 --- a/public/app/features/dashboard/directives/dashSearchView.js +++ b/public/app/features/dashboard/directives/dashSearchView.js @@ -29,7 +29,7 @@ function (angular, $) { editorScope = null; }; - var view = $(''); + var view = $(''); elem.append(view); $compile(elem.contents())(editorScope);