chrome/browser/resources/file_manager/js/file_selection.js - Issue 18627002: Change dialog texts for folder upload to explicitly indicate it's for 'Uploading'

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/file_manager/js/file_selection.js

Issue 18627002: Change dialog texts for folder upload to explicitly indicate it's for 'Uploading' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: build fix Created 7 years, 5 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 | « chrome/browser/resources/file_manager/js/file_manager.js ('k') | chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/file_manager/js/file_selection.js

diff --git a/chrome/browser/resources/file_manager/js/file_selection.js b/chrome/browser/resources/file_manager/js/file_selection.js

index bf6ce06f1a342e98b28a709050712c3dd2bbf5e4..851e8d50ee28cc23152be1fdd7b976dfd334438c 100644

--- a/chrome/browser/resources/file_manager/js/file_selection.js

+++ b/chrome/browser/resources/file_manager/js/file_selection.js

@@ -264,7 +264,8 @@ FileSelectionHandler.prototype.updateOkButton = function() {

var selectable;

var dialogType = this.fileManager_.dialogType;

- if (dialogType == DialogType.SELECT_FOLDER) {

+ if (dialogType == DialogType.SELECT_FOLDER ||

+ dialogType == DialogType.SELECT_UPLOAD_FOLDER) {

// In SELECT_FOLDER mode, we allow to select current directory

// when nothing is selected.

selectable = this.selection.directoryCount <= 1 &&