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

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

Issue 9701063: Fix file manager to better handle missing roots and scan failure (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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
Index: chrome/browser/resources/file_manager/js/file_manager.js
diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js
index e365a1bbd120fddb4fae1e7de6fc5b8a4d34160d..4e2dcc4a40da30ac9977aebe7ec74b3c3e20ef1e 100644
--- a/chrome/browser/resources/file_manager/js/file_manager.js
+++ b/chrome/browser/resources/file_manager/js/file_manager.js
@@ -1152,7 +1152,7 @@ FileManager.prototype = {
var entry =
this.getRootEntry_(this.rootsList_.selectionModel.selectedIndex);
- return DirectoryModel.getRootType(entry.fullPath) ==
+ return entry && DirectoryModel.getRootType(entry.fullPath) ==
DirectoryModel.RootType.REMOVABLE;
}
};
@@ -1473,13 +1473,6 @@ FileManager.prototype = {
* window has neither.
*/
FileManager.prototype.setupCurrentDirectory_ = function() {
- // Avoid a bunch of intermediate list redraws while the data model is
- // cleared and updated. Note that it may (or may not) be desirable to draw
- // partial results as we get them, but today the DirectoryReader API
- // generally returns all entries in one chunk so even without this batching
- // we wouldn't have incremental updates.
- this.table_.startBatchUpdates();
- var onLoaded = this.table_.endBatchUpdates.bind(this.table_);
if (location.hash) {
// Location hash has the highest priority.
@@ -1513,7 +1506,6 @@ FileManager.prototype = {
// until the selection is done.
var self = this;
function onLoadedActivateLeaf() {
- onLoaded();
if (foundLeaf) {
self.dispatchDefaultTask_();
setTimeout(removeShade, 1000);
@@ -1524,14 +1516,14 @@ FileManager.prototype = {
return;
}
- this.directoryModel_.setupPath(path, onLoaded);
+ this.directoryModel_.setupPath(path);
return;
}
if (this.params_.defaultPath) {
var path = this.params_.defaultPath;
if (this.dialogType_ == FileManager.DialogType.SELECT_SAVEAS_FILE) {
- this.directoryModel_.setupPath(path, onLoaded,
+ this.directoryModel_.setupPath(path, undefined,
function(basePath, leafName) {
this.filenameInput_.value = leafName;
this.selectDefaultPathInFilenameInput_();
@@ -1539,11 +1531,11 @@ FileManager.prototype = {
return;
}
- this.directoryModel_.setupPath(path, onLoaded);
+ this.directoryModel_.setupPath(path);
return;
}
- this.directoryModel_.setupDefaultPath(onLoaded);
+ this.directoryModel_.setupDefaultPath();
};
/**

Powered by Google App Engine
This is Rietveld 408576698