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

Merge branch 'staging' into secureiframe

Browse Source
This commit is contained in:
yflory 2020-04-07 15:41:49 +02:00
commit ca8c50ca37
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/inner/access.js
View File

@ -309,7 +309,7 @@ define([
called = true; called = true;
nThen(function (waitFor) { nThen(function (waitFor) {
if (!reload) { return; } if (!reload) { return; }
Modal.loadMetadata(common, data, waitFor, "owner"); Modal.loadMetadata(Env, data, waitFor, "owner");
}).nThen(function () { }).nThen(function () {
owners = data.owners || []; owners = data.owners || [];
pending_owners = data.pending_owners || []; pending_owners = data.pending_owners || [];
@ -617,7 +617,7 @@ define([
called = true; called = true;
nThen(function (waitFor) { nThen(function (waitFor) {
if (!reload) { return; } if (!reload) { return; }
Modal.loadMetadata(common, data, waitFor, "allow"); Modal.loadMetadata(Env, data, waitFor, "allow");
}).nThen(function () { }).nThen(function () {
owners = data.owners || []; owners = data.owners || [];
restricted = data.restricted || false; restricted = data.restricted || false;