infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'soon' into staging

pull/1/head
ansuz 2019-08-16 17:39:54 +02:00
parent 04feef793b bbd59c6a2b
commit 5dacc6ceeb
4 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/cryptpad-common.js
View File

@ -138,7 +138,7 @@ define([
}
postMessage("SET", {
key:['drive'],
value: data
value: data.drive
}, function (obj) {
cb(obj);
}, {

4
www/common/proxy-manager.js
View File

@ -1036,6 +1036,9 @@ define([
var isInSharedFolder = _isInSharedFolder;
/* Generic: doesn't need access to a proxy */
var isValidDrive = function (Env, obj) {
return Env.user.userObject.isValidDrive(obj);
};
var isFile = function (Env, el, allowStr) {
return Env.user.userObject.isFile(el, allowStr);
};
@ -1131,6 +1134,7 @@ define([
getUserObjectPath: callWithEnv(getUserObjectPath),
isDuplicateOwned: callWithEnv(isDuplicateOwned),
// Generic
isValidDrive: callWithEnv(isValidDrive),
isFile: callWithEnv(isFile),
isFolder: callWithEnv(isFolder),
isSharedFolder: callWithEnv(isSharedFolder),

14
www/common/userObject.js
View File

@ -72,8 +72,22 @@ define([
a[TRASH] = {};
a[FILES_DATA] = {};
a[TEMPLATE] = [];
a[SHARED_FOLDERS] = {};
return a;
};
var type = function (dat) {
return dat === null? 'null': Array.isArray(dat)?'array': typeof(dat);
};
exp.isValidDrive = function (obj) {
var base = exp.getStructure();
return typeof (obj) === "object" &&
Object.keys(base).every(function (key) {
console.log(key, obj[key], type(obj[key]));
return obj[key] && type(base[key]) === type(obj[key]);
});
};
var getHrefArray = function () {
return [TEMPLATE];
};

4
www/drive/inner.js
View File

@ -4245,6 +4245,10 @@ define([
return;
}
history.sfId = false;
var ok = manager.isValidDrive(obj.drive);
if (!ok) { return; }
copyObjectValue(files, obj.drive);
appStatus.isReady = true;
refresh();