diff options
| author | Eric Guzman | 2012-03-17 00:05:14 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-17 00:05:14 -0700 |
| commit | a3192d8bc0f8c0698265817c14dcd2284fd89d7d (patch) | |
| tree | 497ac55f550ed52f9d73b464aafb2aa6cb5f5038 /js/io/ui/file-picker/file-picker-controller.js | |
| parent | a6a6f9bcc5ff92f5bb5e9275336dfaec2d8e8f4c (diff) | |
| parent | 954f5a13e371febcb1c0fb8015c577ee51c23130 (diff) | |
| download | ninja-a3192d8bc0f8c0698265817c14dcd2284fd89d7d.tar.gz | |
Merge branch 'refs/heads/master' into AddAnimationsLibrary
Conflicts:
js/panels/presets/default-transition-presets.js
Diffstat (limited to 'js/io/ui/file-picker/file-picker-controller.js')
| -rwxr-xr-x | js/io/ui/file-picker/file-picker-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/io/ui/file-picker/file-picker-controller.js b/js/io/ui/file-picker/file-picker-controller.js index 3b19de83..105dc223 100755 --- a/js/io/ui/file-picker/file-picker-controller.js +++ b/js/io/ui/file-picker/file-picker-controller.js | |||
| @@ -104,7 +104,7 @@ var FilePickerController = exports.FilePickerController = Montage.create(require | |||
| 104 | aModel.topLevelDirectories = topLevelDirectories; | 104 | aModel.topLevelDirectories = topLevelDirectories; |
| 105 | 105 | ||
| 106 | if(!!topLevelDirectories && !!topLevelDirectories[0]){ | 106 | if(!!topLevelDirectories && !!topLevelDirectories[0]){ |
| 107 | aModel.currentRoot = topLevelDirectories[0].uri; | 107 | aModel.currentRoot = aModel.currentLogicalDrive = topLevelDirectories[0].uri; |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | //populate the last opened folder first, if none then populate default root | 110 | //populate the last opened folder first, if none then populate default root |