diff options
| author | rginda@chromium.org <rginda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-03 17:01:33 +0000 |
|---|---|---|
| committer | rginda@chromium.org <rginda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-03 17:01:33 +0000 |
| commit | 806cf8faeeb9a6edc92e5c93b1334d5bd0c7a665 (patch) | |
| tree | 8bccb057e3191c8497a86c1613665c5afb7e9fd4 | |
| parent | f6c2409a556406f5f0928df980e8234d12529664 (diff) | |
| download | chromium_src-806cf8faeeb9a6edc92e5c93b1334d5bd0c7a665.zip chromium_src-806cf8faeeb9a6edc92e5c93b1334d5bd0c7a665.tar.gz chromium_src-806cf8faeeb9a6edc92e5c93b1334d5bd0c7a665.tar.bz2 | |
Merge 87732 - file manager: Fix okButton updating.
update the okButton whenever the directory changes.
This fixes bug 15845, which was caused by trying to update the button before we had set the current directory, and bug 15464, which was due to the fact that we relied on "Selection changed" events to trigger button updates.
BUG=chromium-os:15845,chromium-os:15464
TEST=manual testing on chromeos-chrome on linux
Review URL: http://codereview.chromium.org/7109033
TBR=rginda@chromium.org
Review URL: http://codereview.chromium.org/7054047
git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@87798 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/file_manager/js/file_manager.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js index c3022a2..e4eba31 100644 --- a/chrome/browser/resources/file_manager/js/file_manager.js +++ b/chrome/browser/resources/file_manager/js/file_manager.js @@ -72,7 +72,6 @@ function FileManager(dialogDom, rootEntries, params) { this.initDialogType_(); this.summarizeSelection_(); - this.updateOkButton_(); this.updatePreview_(); chrome.fileBrowserPrivate.onDiskChanged.addListener( @@ -1657,6 +1656,7 @@ FileManager.prototype = { location.href); } + this.updateOkButton_(); // New folder should never be enabled in the root or media/ directories. this.newFolderButton_.disabled = (this.currentDirEntry_.fullPath == '/' || |