web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'soon' into staging

Browse Source
This commit is contained in:
ansuz 2019-06-14 10:45:25 +02:00
commit 7b8ac3d8c8
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
www/common/outer/async-store.js
View File

@ -327,15 +327,6 @@ define([
account.note = obj.note; account.note = obj.note;
cb(obj); cb(obj);
}); });
arePinsSynced(function (err, yes) {
if (!yes) {
resetPins(function (err) {
if (err) { return console.error(err); }
console.log('RESET DONE');
});
}
});
}); });
}); });
}; };
@ -1666,6 +1657,15 @@ define([
loadUniversal(Profile, 'profile', waitFor); loadUniversal(Profile, 'profile', waitFor);
cleanFriendRequests(); cleanFriendRequests();
}).nThen(function () { }).nThen(function () {
arePinsSynced(function (err, yes) {
if (!yes) {
resetPins(function (err) {
if (err) { return console.error(err); }
console.log('RESET DONE');
});
}
});
var requestLogin = function () { var requestLogin = function () {
broadcast([], "REQUEST_LOGIN"); broadcast([], "REQUEST_LOGIN");
}; };