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

Don't check for stronger hash if we have an edit hash

Browse Source
This commit is contained in:
yflory 2018-01-26 15:44:34 +01:00
parent 462c229b17
commit 36550b781f
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/common-hash.js
View File

@ -300,6 +300,8 @@ Version 1
var rHref = href || getRelativeHref(window.location.href); var rHref = href || getRelativeHref(window.location.href);
var parsed = parsePadUrl(rHref); var parsed = parsePadUrl(rHref);
if (!parsed.hash) { return false; } if (!parsed.hash) { return false; }
// We can't have a stronger hash if we're already in edit mode
if (parsed.hashData && parsed.hashData.mode === 'edit') { return; }
var stronger; var stronger;
Object.keys(recents).some(function (id) { Object.keys(recents).some(function (id) {
var pad = recents[id]; var pad = recents[id];

5
www/common/cryptpad-common.js
View File

@ -557,6 +557,11 @@ define([
return void cb(null, hashes); return void cb(null, hashes);
} }
if (hashes.editHash) {
// no need to find stronger if we already have edit hash
return void cb(null, hashes);
}
postMessage("GET_STRONGER_HASH", { postMessage("GET_STRONGER_HASH", {
href: window.location.href href: window.location.href
}, function (hash) { }, function (hash) {