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

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

Issue 10699011: Merge 142968 - [filemanager] Fix problems when Drive root is set as default folder. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/src/
Patch Set: Created 8 years, 6 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/file_manager/js/file_manager.js
===================================================================
--- chrome/browser/resources/file_manager/js/file_manager.js (revision 144539)
+++ chrome/browser/resources/file_manager/js/file_manager.js (working copy)
@@ -19,6 +19,8 @@
this.params_ = location.search ?
JSON.parse(decodeURIComponent(location.search.substr(1))) :
{};
+ if (this.params_.defaultPath && this.params_.defaultPath.indexOf('/') != 0)
+ this.params_.defaultPath = '/' + this.params_.defaultPath;
this.listType_ = null;
this.showDelayTimeout_ = null;
@@ -4159,7 +4161,7 @@
var onProperties = function(properties) {
for (var i = 0; i < properties.length; i++) {
- if (properties[i].present) {
+ if (!properties[i] || properties[i].present) {
// For files already in GCache, we don't get any transfer updates.
filesTotal--;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698