infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

fix anon pad import

pull/1/head
ansuz 2018-07-09 14:34:33 +02:00
parent a15e232469
commit 16f276a18c
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
customize.dist/login.js
View File

@ -302,12 +302,19 @@ define([
waitFor.abort();
res.blockHash = blockHash;
res.userHash = false;
if (shouldImport) {
setMergeAnonDrive();
}
return void cb('ALREADY_REGISTERED', res);
}
if (!isRegister && !isProxyEmpty(rt.proxy)) {
LocalStore.setBlockHash(blockHash);
waitFor.abort();
if (shouldImport) {
setMergeAnonDrive();
}
return void LocalStore.login(false, uname, function () {
cb(void 0, res);
});
@ -321,7 +328,12 @@ define([
proxy.login_name = uname;
proxy[Constants.displayNameKey] = uname;
setCreateReadme();
if (!shouldImport) { proxy.version = 6; }
if (shouldImport) {
setMergeAnonDrive();
} else {
proxy.version = 6;
}
Feedback.send('REGISTRATION', true);
} else {
Feedback.send('LOGIN', true);