web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

When importing a shared folder to the drive, open this folder directly

Browse Source
This commit is contained in:
yflory
2018-08-23 11:55:14 +02:00
parent 630a2dab78
commit e0b7f3f965
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
www/drive/inner.js
View File

@@ -388,6 +388,13 @@ define([
// FILE MANAGER
var currentPath = APP.currentPath = getLastOpenedFolder();
if (APP.newSharedFolder) {
var newSFPaths = manager.findFile(APP.newSharedFolder);
if (newSFPaths.length) {
currentPath = newSFPaths[0];
}
}
// Categories dislayed in the menu
var displayedCategories = [ROOT, TRASH, SEARCH, RECENT];
@@ -3362,8 +3369,12 @@ define([
}).nThen(function () {
var sframeChan = common.getSframeChannel();
var metadataMgr = common.getMetadataMgr();
var privateData = metadataMgr.getPrivateData();
APP.disableSF = !metadataMgr.getPrivateData().enableSF && AppConfig.disableSharedFolders;
if (privateData.newSharedFolder) {
APP.newSharedFolder = privateData.newSharedFolder;
}
APP.disableSF = !privateData.enableSF && AppConfig.disableSharedFolders;
var configTb = {
displayed: ['useradmin', 'pageTitle', 'newpad', 'limit'],