Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
commit
16c54652cd
|
@ -709,10 +709,9 @@
|
|||
"dev": true
|
||||
},
|
||||
"lodash.merge": {
|
||||
"version": "4.6.1",
|
||||
"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
|
||||
"integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==",
|
||||
"dev": true
|
||||
"version": "4.6.2",
|
||||
"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
|
||||
"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
|
||||
},
|
||||
"lodash.sortby": {
|
||||
"version": "4.7.0",
|
||||
|
|
|
@ -512,13 +512,14 @@ define([
|
|||
// Tags used: display Tags category
|
||||
if (Object.keys(manager.getTagsList()).length) { displayedCategories.push(TAGS); }
|
||||
|
||||
var virtualCategories = [SEARCH, RECENT, OWNED, TAGS, SHARED_FOLDER];
|
||||
var virtualCategories = [SEARCH, RECENT, OWNED, TAGS];
|
||||
|
||||
if (!APP.loggedIn) {
|
||||
$tree.hide();
|
||||
if (APP.newSharedFolder) {
|
||||
// ANON_SHARED_FOLDER
|
||||
displayedCategories = [SHARED_FOLDER];
|
||||
virtualCategories.push(SHARED_FOLDER);
|
||||
currentPath = [SHARED_FOLDER, ROOT];
|
||||
} else {
|
||||
displayedCategories = [FILES_DATA];
|
||||
|
|
Loading…
Reference in New Issue