chrome/browser/resources/file_manager/foreground/js/directory_tree.js - Issue 101243003: Remove getCurrentDirectoryURL and getCurrentDirPath from directory_model.js

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/foreground/js/directory_tree.js

Issue 101243003: Remove getCurrentDirectoryURL and getCurrentDirPath from directory_model.js (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years 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/foreground/js/directory_model.js ('K') | « chrome/browser/resources/file_manager/foreground/js/directory_model.js ('k') | chrome/browser/resources/file_manager/foreground/js/file_manager.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/file_manager/foreground/js/directory_tree.js

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

index 8405a207d0ad901df4b892d69665408abf66cffb..9869f9597132031120e107bdec1932e9af375258 100644

--- a/chrome/browser/resources/file_manager/foreground/js/directory_tree.js

+++ b/chrome/browser/resources/file_manager/foreground/js/directory_tree.js

@@ -374,8 +374,11 @@ DirectoryItem.prototype.doDropTargetAction = function() {

* Executes the assigned action. DirectoryItem performs changeDirectory.

DirectoryItem.prototype.doAction = function() {

- if (this.fullPath !== this.directoryModel_.getCurrentDirPath())

+ // TODO(mtomasz, yoshiki): Do not use fullPaths here, but Entry instead.

+ if (!this.directoryModel_.getCurrentDirEntry() ||

+ this.fullPath !== this.directoryModel_.getCurrentDirEntry().fullPath) {

this.directoryModel_.changeDirectory(this.fullPath);

+ }

};

/**