The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-14 02:55:42 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix folder selection issues

Browse Source
This commit is contained in:
yflory 2023-07-05 16:31:45 +03:00
parent 50ee3cf436
commit c6cb38f2c8
4 changed files with 26 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
customize.dist/src/less2/include/tree.less
View File

@ -9,6 +9,10 @@
.cp-tree {
color: @cryptpad_text_col;
&, ul {
list-style-type: none;
}
li.cp-tree-line {
margin-left: 1em;
}
@ -46,4 +50,4 @@
}
}
}
}

83
www/common/sframe-common-file.js
View File

@ -342,73 +342,11 @@ define([
])
];
var defaultPath = 'Drive/Images/Example';
var defaultPath = 'Drive'; // XXX
defaultPath.split('/').forEach(function(folder) {
breadcrumbContent.push(h('li.breadcrumb-item', folder));
});
var drives =
[
{
name: "drive",
pathName: "root",
isShared: false,
children: [
{
name: "Folder 1",
pathName: "Folder 1",
isShared: false,
children: [
{
name: "Subfolder1",
pathName: "Subfolder1",
isShared: false,
children: []
},
{
name: "Subfolder2",
pathName: "Subfolder2",
isShared: false,
children: []
}
]
},
{
name: "Shared Folder",
pathName: ["id675478998765", "root"],
isShared: true,
children: [
{
name: "SubFolderInSharedFolder",
pathName: "SubFolderInSharedFolder",
isShared: false,
children: []
}
]
}
]
},
{
name: "teamID1",
isShared: false,
pathName: "teamID1",
children: [
{
name: "FolderA",
pathName: "FolderA",
isShared: false,
children: []
},
{
name: "FolderB",
pathName: "FolderB",
isShared: false,
children: []
}
]
}
];
let pathContainer;
// Ask for name, password and owner
@ -460,9 +398,10 @@ define([
});
// Tree initializer
var selectedPath = false;
$content.find('button').click(function() {
$(this).hide();
// Just remove the breadcrumb
var $container = $(pathContainer);
$container.empty();
@ -476,9 +415,8 @@ define([
$container.append($tree);
var $selection = false;
var selectedPath = false;
var createTreeLine = function ($parent, item, parentPath) {
var createTreeLine = function ($parent, item, parentPath, itemTeamId) {
var isOpen = false;
var $line = $('<li class="cp-tree-line">');
@ -528,7 +466,7 @@ define([
var $ul = $('<ul>').hide();
$line.append($ul);
item.children.forEach(function (child) {
createTreeLine($ul, child, itemPath);
createTreeLine($ul, child, itemPath, itemTeamId);
});
}
@ -539,13 +477,14 @@ define([
}
$selection = $selectable;
selectedPath = itemPath;
teamId = itemTeamId;
console.log(itemPath.join('/'));
});
}
};
drives.forEach(function (item) {
createTreeLine($tree, item, []);
})
createTreeLine($tree, item, [], item.teamId);
});
});
});
@ -573,6 +512,7 @@ define([
password: password,
owned: owned,
forceSave: forceSave,
path: selectedPath || undefined,
alt: alt,
});
});
@ -700,6 +640,9 @@ define([
owned = obj.owned;
forceSave = obj.forceSave;
alt = obj.alt;
if (obj.path) {
e.path = obj.path;
}
finish();
}, preview);
}

11
www/common/sframe-common-outer.js
View File

@ -1152,6 +1152,12 @@ define([
Cryptpad.changePadPassword(Cryptget, Crypto, data, cb);
});
sframeChan.on('Q_GET_FOLDERS_LIST', function (data, cb) {
Cryptpad.getFoldersList(cb);
});
sframeChan.on('Q_DELETE_OWNED', function (data, cb) {
Cryptpad.userObjectCommand({
cmd: 'deleteOwned',
@ -1729,11 +1735,6 @@ define([
});
});
sframeChan.on('Q_GET_FOLDERS_LIST', function (data, cb) {
Cryptpad.getFoldersList(cb);
});
sframeChan.on('Q_CHANGE_USER_PASSWORD', function (data, cb) {
Cryptpad.changeUserPassword(Cryptget, edPublic, data, cb);
});

2
www/secureiframe/app-secure.less
View File

@ -9,6 +9,7 @@
@import (reference) '../../customize/src/less2/include/modals-ui-elements.less';
@import (reference) '../../customize/src/less2/include/usergrid.less';
@import (reference) '../../customize/src/less2/include/forms.less';
@import (reference) '../../customize/src/less2/include/tree.less';
&.cp-app-secureiframe {
.modals-ui-elements_main();
@ -21,6 +22,7 @@
.modal_main();
.usergrid_main();
.forms_main();
.tree_main();
.fa-shhare-alt:before { content: "\f1e0"; }