Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(139)

Unified Diff: ui/file_manager/file_manager/foreground/js/file_manager.js

Issue 331583003: Files.app: Add a test to open a file dialog box. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed. Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/file_manager/file_manager/background/js/test_util.js ('k') | ui/file_manager/file_manager/manifest.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « ui/file_manager/file_manager/background/js/test_util.js ('k') | ui/file_manager/file_manager/manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698