From 8043e3d6225c3c60fb76a0c7e2194ffbb5c797b0 Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 19 Apr 2021 17:21:57 +0200 Subject: [PATCH 1/3] Fix drive stuck offline because of a restricted shared folder --- www/common/outer/cache-store.js | 2 +- www/common/outer/sharedfolder.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/www/common/outer/cache-store.js b/www/common/outer/cache-store.js index 45f334bb4..884d98914 100644 --- a/www/common/outer/cache-store.js +++ b/www/common/outer/cache-store.js @@ -2,7 +2,7 @@ define([ '/common/common-util.js', '/bower_components/localforage/dist/localforage.min.js', ], function (Util, localForage) { - var S = {}; + var S = window.CryptPad_Cache = {}; var onReady = Util.mkEvent(true); // Check if indexedDB is allowed diff --git a/www/common/outer/sharedfolder.js b/www/common/outer/sharedfolder.js index 3bc39546c..6735330b4 100644 --- a/www/common/outer/sharedfolder.js +++ b/www/common/outer/sharedfolder.js @@ -249,6 +249,7 @@ define([ if (obj.store.handleSharedFolder) { obj.store.handleSharedFolder(obj.id, null); } + obj.cb(); }); } catch (e) {} delete allSharedFolders[secret.channel]; @@ -260,6 +261,7 @@ define([ if (info.error === "ERESTRICTED" ) { sf.teams.forEach(function (obj) { obj.store.manager.restrictedProxy(obj.id, secret.channel); + obj.cb(); }); delete allSharedFolders[secret.channel]; return void cb(); From 8f47b183b302e1f5be4031314cb3ac8126d7bb79 Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 19 Apr 2021 17:21:57 +0200 Subject: [PATCH 2/3] Fix drive stuck offline because of a restricted shared folder --- www/common/outer/cache-store.js | 2 +- www/common/outer/sharedfolder.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/www/common/outer/cache-store.js b/www/common/outer/cache-store.js index 45f334bb4..884d98914 100644 --- a/www/common/outer/cache-store.js +++ b/www/common/outer/cache-store.js @@ -2,7 +2,7 @@ define([ '/common/common-util.js', '/bower_components/localforage/dist/localforage.min.js', ], function (Util, localForage) { - var S = {}; + var S = window.CryptPad_Cache = {}; var onReady = Util.mkEvent(true); // Check if indexedDB is allowed diff --git a/www/common/outer/sharedfolder.js b/www/common/outer/sharedfolder.js index 3bc39546c..6735330b4 100644 --- a/www/common/outer/sharedfolder.js +++ b/www/common/outer/sharedfolder.js @@ -249,6 +249,7 @@ define([ if (obj.store.handleSharedFolder) { obj.store.handleSharedFolder(obj.id, null); } + obj.cb(); }); } catch (e) {} delete allSharedFolders[secret.channel]; @@ -260,6 +261,7 @@ define([ if (info.error === "ERESTRICTED" ) { sf.teams.forEach(function (obj) { obj.store.manager.restrictedProxy(obj.id, secret.channel); + obj.cb(); }); delete allSharedFolders[secret.channel]; return void cb(); From 1c2a6949e2cd30ae88333b0557e8f08b951d66e4 Mon Sep 17 00:00:00 2001 From: ansuz Date: Tue, 20 Apr 2021 13:30:55 +0530 Subject: [PATCH 3/3] strict semver for bootstrap-tokenfield --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index f9a3dc5be..82a9931ea 100644 --- a/bower.json +++ b/bower.json @@ -41,7 +41,7 @@ "diff-dom": "2.1.1", "nthen": "0.1.7", "open-sans-fontface": "^1.4.2", - "bootstrap-tokenfield": "^0.12.1", + "bootstrap-tokenfield": "0.12.1", "localforage": "^1.5.2", "html2canvas": "^0.4.1", "croppie": "^2.5.0",