chrome/browser/resources/file_manager/js/file_transfer_controller.js - Issue 10342010: Add gdata content search to file_manager

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_transfer_controller.js

Issue 10342010: Add gdata content search to file_manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 8 years, 7 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

« chrome/browser/resources/file_manager/js/file_manager.js ('K') | « chrome/browser/resources/file_manager/js/file_manager.js ('k') | chrome/browser/resources/file_manager/js/util.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 0848fee7d019ca2384dac15df80bdc22660ae2c6..e0e739a7e9b388e5b05285492d00e3840a0acb35 100644

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

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

@@ -400,6 +400,8 @@ FileTransferController.prototype = {

if (this.directoryModel_.isPathReadOnly(destinationPath)) {

return false;

}

+ if (this.directoryModel_.isSearching())

+ return false;

if (!dataTransfer.types || dataTransfer.types.indexOf('fs/tag') == -1)

return false; // Unsupported type of content.

@@ -481,7 +483,7 @@ FileTransferController.prototype = {

get currentDirectory() {

- return this.directoryModel_.getCurrentDirEntry();

+ return this.directoryModel_.getSearchOrCurrentDirEntry();

get readonly() {