Add /p/ to the hash when adding a password
parent
427cf836b1
commit
fa2ad4e476
|
@ -1531,8 +1531,7 @@ define([
|
|||
Store.leavePad = function (clientId, data, cb) {
|
||||
var channel = channels[data.channel];
|
||||
if (!channel || !channel.cpNf) { return void cb ({error: 'EINVAL'}); }
|
||||
channel.cpNf.stop();
|
||||
delete channels[data.channel];
|
||||
Store.dropChannel(data.channel);
|
||||
cb();
|
||||
};
|
||||
Store.sendPadMsg = function (clientId, data, cb) {
|
||||
|
@ -1850,7 +1849,7 @@ define([
|
|||
// Clients management
|
||||
var driveEventClients = [];
|
||||
|
||||
var dropChannel = function (chanId) {
|
||||
var dropChannel = Store.dropChannel = function (chanId) {
|
||||
try {
|
||||
store.messenger.leavePad(chanId);
|
||||
} catch (e) { console.error(e); }
|
||||
|
|
|
@ -174,7 +174,16 @@ define([
|
|||
var parsed = Utils.Hash.parsePadUrl(window.location.href);
|
||||
var todo = function () {
|
||||
secret = Utils.secret = Utils.Hash.getSecrets(parsed.type, void 0, password);
|
||||
Cryptpad.getShareHashes(secret, waitFor(function (err, h) { hashes = h; }));
|
||||
Cryptpad.getShareHashes(secret, waitFor(function (err, h) {
|
||||
hashes = h;
|
||||
if (password && !parsed.hashData.password) {
|
||||
var ohc = window.onhashchange;
|
||||
window.onhashchange = function () {};
|
||||
window.location.hash = h.fileHash || h.editHash || h.viewHash || window.location.hash;
|
||||
window.onhashchange = ohc;
|
||||
ohc({reset: true});
|
||||
}
|
||||
}));
|
||||
};
|
||||
|
||||
if (!parsed.hashData) { // No hash, no need to check for a password
|
||||
|
|
Loading…
Reference in New Issue