Merge branch 'main' into soon

pull/1/head
ansuz 3 years ago
commit 4e9a9681f4

@ -2289,7 +2289,8 @@ define([
var createTitle = function ($container, path, noStyle) { var createTitle = function ($container, path, noStyle) {
if (!path || path.length === 0) { return; } if (!path || path.length === 0) { return; }
var isTrash = manager.isPathIn(path, [TRASH]); var isTrash = manager.isPathIn(path, [TRASH]);
if (APP.mobile() && !noStyle) { // noStyle means title in search result // we assume that users viewing shared folders may want to see the "bread-crumb"
if (!APP.newSharedFolder && APP.mobile() && !noStyle) { // noStyle means title in search result
return $container; return $container;
} }
var isVirtual = virtualCategories.indexOf(path[0]) !== -1; var isVirtual = virtualCategories.indexOf(path[0]) !== -1;
@ -3147,7 +3148,8 @@ define([
if (APP.$burnThisDrive) { if (APP.$burnThisDrive) {
APP.toolbar.$bottomR.append(APP.$burnThisDrive); APP.toolbar.$bottomR.append(APP.$burnThisDrive);
} }
collapseTreeButton(); // this button is not useful for unregistered users who do not have a tree worth looking at
if (APP.loggedIn) { collapseTreeButton(); }
return $toolbar; return $toolbar;
}; };

@ -97,7 +97,7 @@ define([
var checkCheckpoints = function (array) { var checkCheckpoints = function (array) {
if (!Array.isArray(array)) { return; } if (!Array.isArray(array)) { return; }
// Keep the last 100 messages // Keep the last 100 messages
if (array.length > 100) { if (array.length > 100) { // XXX
array.splice(0, array.length - 100); array.splice(0, array.length - 100);
} }
// Remove every message before the first checkpoint // Remove every message before the first checkpoint

@ -176,7 +176,7 @@ define([
validateKey: keys.secondaryValidateKey, validateKey: keys.secondaryValidateKey,
owners: [myKeys.edPublic], owners: [myKeys.edPublic],
crypto: crypto, crypto: crypto,
Cache: Utils.Cache //Cache: Utils.Cache // XXX
}; };
var results = {}; var results = {};
config.onError = function (info) { config.onError = function (info) {

Loading…
Cancel
Save