Drive in sandboxed iframe

2017-09-22 19:35:06 +02:00
parent a810d7bd85
commit 47fe7b1c53
12 changed files with 573 additions and 442 deletions
--- a/www/settings/main.js
+++ b/www/settings/main.js
@@ -381,7 +381,7 @@ define([
                if (!yes) { return; }
                $spinner.show();
                $ok.hide();
-                Merge.anonDriveIntoUser(obj.proxy, function () {
+                Merge.anonDriveIntoUser(obj, localStorage.FS_hash, function () {
                    $spinner.hide();
                    $ok.show();
                    Cryptpad.alert(Messages.settings_importDone);