diff --git a/src/core_plugins/console/public/src/controllers/sense_controller.js b/src/core_plugins/console/public/src/controllers/sense_controller.js index 172c19f454e2f..c87cab87e8ef4 100644 --- a/src/core_plugins/console/public/src/controllers/sense_controller.js +++ b/src/core_plugins/console/public/src/controllers/sense_controller.js @@ -3,7 +3,6 @@ import { useResizeCheckerProvider } from '../sense_editor_resize'; import $ from 'jquery'; import { initializeInput } from '../input'; import { initializeOutput } from '../output'; -import es from '../es'; import init from '../app'; import { SenseTopNavController } from './sense_top_nav_controller'; @@ -20,7 +19,7 @@ module.run(function (Private, $rootScope) { module.controller('SenseController', function SenseController(Private, $scope, $timeout, $location, docTitle) { docTitle.change('Console'); - $scope.topNavController = Private(SenseTopNavController) + $scope.topNavController = Private(SenseTopNavController); // We need to wait for these elements to be rendered before we can select them with jQuery // and then initialize this app diff --git a/src/core_plugins/console/public/src/directives/sense_settings.js b/src/core_plugins/console/public/src/directives/sense_settings.js index dfa749e01fffd..72507467f8112 100644 --- a/src/core_plugins/console/public/src/directives/sense_settings.js +++ b/src/core_plugins/console/public/src/directives/sense_settings.js @@ -7,7 +7,7 @@ require('ui/modules') restrict: 'E', template: require('./settings.html'), controllerAs: 'settings', - controller: function ($scope) { + controller: function ($scope, $element) { const settings = require('../settings'); this.vals = settings.getCurrentSettings(); @@ -16,6 +16,16 @@ require('ui/modules') $scope.kbnTopNav.close(); }; + const self = this; + + function onEnter(event) { + if (event.which === 13) { + self.apply(); + } + } + + const boundElement = $element.bind('keydown', onEnter); + $scope.$on('$destroy', () => boundElement.unbind('keydown', onEnter)); }, }; }); diff --git a/src/ui/public/kbn_top_nav/kbn_top_nav.js b/src/ui/public/kbn_top_nav/kbn_top_nav.js index fbfc9b43c809d..57a52f7bfdd7b 100644 --- a/src/ui/public/kbn_top_nav/kbn_top_nav.js +++ b/src/ui/public/kbn_top_nav/kbn_top_nav.js @@ -1,6 +1,5 @@ import _ from 'lodash'; import 'ui/watch_multi'; -import angular from 'angular'; import 'ui/directives/input_focus'; import uiModules from 'ui/modules'; import template from './kbn_top_nav.html'; diff --git a/src/ui/public/kbn_top_nav/kbn_top_nav_controller.js b/src/ui/public/kbn_top_nav/kbn_top_nav_controller.js index e31874d59a653..4e8e6577881cc 100644 --- a/src/ui/public/kbn_top_nav/kbn_top_nav_controller.js +++ b/src/ui/public/kbn_top_nav/kbn_top_nav_controller.js @@ -1,7 +1,6 @@ import { capitalize, isArray, isFunction } from 'lodash'; import chrome from 'ui/chrome'; -import uiModules from 'ui/modules'; import filterTemplate from 'ui/chrome/config/filter.html'; import intervalTemplate from 'ui/chrome/config/interval.html';