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

Merge branch 'soon' into staging

Browse Source
This commit is contained in:
ansuz 2019-01-18 15:45:02 +01:00
commit 93c5dc9202
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www/settings/main.js
View File

@ -43,11 +43,10 @@ define([
}); });
}); });
sframeChan.on('Q_SETTINGS_DRIVE_GET', function (d, cb) { sframeChan.on('Q_SETTINGS_DRIVE_GET', function (d, cb) {
if (d === "full") {
// We want shared folders too
}
Cryptpad.getUserObject(function (obj) { Cryptpad.getUserObject(function (obj) {
if (obj.error) { return void cb(obj); } if (obj.error) { return void cb(obj); }
if (d === "full") {
// We want shared folders too
var result = { var result = {
uo: obj, uo: obj,
sf: {} sf: {}
@ -62,9 +61,14 @@ define([
}).nThen(function () { }).nThen(function () {
cb(result); cb(result);
}); });
return;
}
// We want only the user object
cb(obj);
}); });
}); });
sframeChan.on('Q_SETTINGS_DRIVE_SET', function (data, cb) { sframeChan.on('Q_SETTINGS_DRIVE_SET', function (data, cb) {
if (data && data.uo) { data = data.uo; }
var sjson = JSON.stringify(data); var sjson = JSON.stringify(data);
require([ require([
'/common/cryptget.js', '/common/cryptget.js',