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

Make sure the href is updated everywhere when importing a stronger link

Browse Source
This commit is contained in:
yflory
2017-03-08 15:49:02 +01:00
parent b701e3cc85
commit 0c1efd361b
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
www/common/mergeDrive.js
View File

@@ -158,6 +158,15 @@ define([
// NOTE: if that weaker version is in the trash, the strong one will be put in unsorted // NOTE: if that weaker version is in the trash, the strong one will be put in unsorted
var weaker = Cryptpad.findWeaker(href, newRecentPads); var weaker = Cryptpad.findWeaker(href, newRecentPads);
if (weaker) { if (weaker) {
// Update RECENTPADS
newRecentPads.some(function (pad) {
if (pad.href === weaker) {
pad.href = href;
return true;
}
return;
});
// Update the file in the drive
newFo.replaceHref(weaker, href); newFo.replaceHref(weaker, href);
return; return;
} }