Index: ui/file_manager/file_manager/foreground/js/file_manager.js |
diff --git a/ui/file_manager/file_manager/foreground/js/file_manager.js b/ui/file_manager/file_manager/foreground/js/file_manager.js |
index 5ad2a946bacdcd2b6beaabea7b5a916eb47fd1cb..a4e96ed7eb8e257d8ddea39e4cc9312737b831e7 100644 |
--- a/ui/file_manager/file_manager/foreground/js/file_manager.js |
+++ b/ui/file_manager/file_manager/foreground/js/file_manager.js |
@@ -677,6 +677,9 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52; |
this.backgroundPage_ = backgroundPage; |
this.backgroundPage_.background.ready(function() { |
loadTimeData.data = this.backgroundPage_.background.stringData; |
+ if (util.platform.runningInBrowser()) { |
+ this.backgroundPage_.registerDialog(window); |
+ } |
callback(); |
}.bind(this)); |
}.bind(this)); |
@@ -2960,14 +2963,14 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52; |
return; |
} |
- switch (util.getKeyModifiers(event) + event.keyCode) { |
- case 'Ctrl-190': // Ctrl-. => Toggle filter files. |
+ switch (util.getKeyModifiers(event) + event.keyIdentifier) { |
+ case 'Ctrl-U+00BE': // Ctrl-. => Toggle filter files. |
this.fileFilter_.setFilterHidden( |
!this.fileFilter_.isFilterHiddenOn()); |
event.preventDefault(); |
return; |
- case '27': // Escape => Cancel dialog. |
+ case 'U+001B': // Escape => Cancel dialog. |
if (this.dialogType != DialogType.FULL_PAGE) { |
// If there is nothing else for ESC to do, then cancel the dialog. |
event.preventDefault(); |