diff --git a/static/scripts/app/views/widgets/dropdown.js b/static/scripts/app/views/widgets/dropdown.js index bb1ca57e61..3703c893e5 100644 --- a/static/scripts/app/views/widgets/dropdown.js +++ b/static/scripts/app/views/widgets/dropdown.js @@ -30,6 +30,19 @@ define([ return true; }); + $(document).keydown(function(e) { + // ESCAPE key pressed + if (e.keyCode == 27) { + var view = app.ui.currentDropdown; + if (view) { + view.hide(); + if (app.ui.currentHighlightedItem) { + app.ui.currentHighlightedItem.rmHighlight(); + } + } + } + }); + var DropdownView = Backbone.View.extend({ defaultOptions: { diff --git a/static/scripts/app/views/widgets/popover.js b/static/scripts/app/views/widgets/popover.js index f6e7e06040..c46bca8084 100644 --- a/static/scripts/app/views/widgets/popover.js +++ b/static/scripts/app/views/widgets/popover.js @@ -27,6 +27,16 @@ define([ return true; }); + $(document).keydown(function(e) { + // ESCAPE key pressed + if (e.keyCode == 27) { + var view = app.ui.currentPopover; + if (view) { + view.hide(); + } + } + }); + $(window).resize(function() { var view = app.ui.currentPopover; if (!view) {