From c449616abd16e971ee3b7fc45e2f6bd0dbaa947d Mon Sep 17 00:00:00 2001 From: "zelidrag@chromium.org" Date: Wed, 27 Jun 2012 20:51:36 +0000 Subject: Merge 142968 - [filemanager] Fix problems when Drive root is set as default folder. - Fixed exception when selecting the Drive root in open-folder dialog. - Fixed defaultPath handling: adding leading slash if necessary. BUG=131772 TEST=See bug. Review URL: https://chromiumcodereview.appspot.com/10586002 TBR=dgozman@chromium.org Review URL: https://chromiumcodereview.appspot.com/10699011 git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@144540 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/resources/file_manager/js/file_manager.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'chrome/browser/resources/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 128591b..126c7b1 100644 --- a/chrome/browser/resources/file_manager/js/file_manager.js +++ b/chrome/browser/resources/file_manager/js/file_manager.js @@ -19,6 +19,8 @@ function FileManager(dialogDom) { 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 @@ FileManager.prototype = { 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--; } -- cgit v1.1