The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-12 19:49:59 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into 2025.12-test

Browse Source
This commit is contained in:
yflory 2026-02-04 14:27:37 +01:00
commit d417fa5cb2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/worker/async-store.js
View File

@ -2779,7 +2779,7 @@ const factory = (Sortify, UserObject, ProxyManager,
const start = (clientId, data, cb) => {
// Don't create a drive if the user only wants to
// open an existing pad
const noDrive = data.neverDrive || (data.noDrive && !data.userHash && !data.anonHash);
let noDrive = data.neverDrive || (data.noDrive && !data.userHash && !data.anonHash);
if (noDrive) {
if (data.neverDrive) { store.neverCache = true; }
return void onNoDrive(clientId, obj => {

5
www/form/main.js
View File

@ -9,7 +9,8 @@ define([
'/common/dom-ready.js',
'/common/common-hash.js',
'/common/sframe-common-outer.js',
], function (nThen, ApiConfig, DomReady, Hash, SFCommonO) {
'/common/outer/local-store.js'
], function (nThen, ApiConfig, DomReady, Hash, SFCommonO, LocalStore) {
var href, hash;
// Loaded in load #2
@ -68,7 +69,7 @@ define([
addData: addData,
addRpc: addRpc,
//cache: true,
noDrive: parsed?.hashData?.mode !== "view",
noDrive: (parsed?.hashData?.mode !== "view" || !LocalStore.isLoggedIn()),
hash: hash,
href: href,
useCreationScreen: true,