Merge branch 'master' of github.com:xwiki-labs/cryptpad
This commit is contained in:
commit
181f848eb9
3 changed files with 7 additions and 6 deletions
8
package-lock.json
generated
8
package-lock.json
generated
|
@ -573,16 +573,16 @@
|
|||
"dev": true
|
||||
},
|
||||
"jshint": {
|
||||
"version": "2.9.7",
|
||||
"resolved": "https://registry.npmjs.org/jshint/-/jshint-2.9.7.tgz",
|
||||
"integrity": "sha512-Q8XN38hGsVQhdlM+4gd1Xl7OB1VieSuCJf+fEJjpo59JH99bVJhXRXAh26qQ15wfdd1VPMuDWNeSWoNl53T4YA==",
|
||||
"version": "2.10.2",
|
||||
"resolved": "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz",
|
||||
"integrity": "sha512-e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"cli": "~1.0.0",
|
||||
"console-browserify": "1.1.x",
|
||||
"exit": "0.1.x",
|
||||
"htmlparser2": "3.8.x",
|
||||
"lodash": "~4.17.10",
|
||||
"lodash": "~4.17.11",
|
||||
"minimatch": "~3.0.2",
|
||||
"shelljs": "0.3.x",
|
||||
"strip-json-comments": "1.0.x"
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"flow-bin": "^0.59.0",
|
||||
"jshint": "~2.9.1",
|
||||
"jshint": "^2.10.2",
|
||||
"less": "2.7.1",
|
||||
"lesshint": "^4.5.0",
|
||||
"selenium-webdriver": "^3.6.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 a new issue