Merge branch 'soon' into staging
This commit is contained in:
commit
93c5dc9202
1 changed files with 20 additions and 16 deletions
|
@ -43,11 +43,10 @@ define([
|
|||
});
|
||||
});
|
||||
sframeChan.on('Q_SETTINGS_DRIVE_GET', function (d, cb) {
|
||||
if (d === "full") {
|
||||
// We want shared folders too
|
||||
}
|
||||
Cryptpad.getUserObject(function (obj) {
|
||||
if (obj.error) { return void cb(obj); }
|
||||
if (d === "full") {
|
||||
// We want shared folders too
|
||||
var result = {
|
||||
uo: obj,
|
||||
sf: {}
|
||||
|
@ -62,9 +61,14 @@ define([
|
|||
}).nThen(function () {
|
||||
cb(result);
|
||||
});
|
||||
return;
|
||||
}
|
||||
// We want only the user object
|
||||
cb(obj);
|
||||
});
|
||||
});
|
||||
sframeChan.on('Q_SETTINGS_DRIVE_SET', function (data, cb) {
|
||||
if (data && data.uo) { data = data.uo; }
|
||||
var sjson = JSON.stringify(data);
|
||||
require([
|
||||
'/common/cryptget.js',
|
||||
|
|
Loading…
Reference in a new issue