diff options
| author | Eric Guzman | 2012-03-13 13:12:43 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-13 13:12:43 -0700 |
| commit | 61fd46cad105f0a52afa028e5301b96120f00ab4 (patch) | |
| tree | d8a7e23e1ea7d9b5c64a288822b7797bb19e50d4 /js/io/ui/file-picker/file-picker-controller.js | |
| parent | 7e3161153b87b891875ac65368a19aed12909fa3 (diff) | |
| parent | f56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff) | |
| download | ninja-61fd46cad105f0a52afa028e5301b96120f00ab4.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/controllers/styles-controller.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 |