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

Merge branch 'soon' into fileManager

Browse Source
This commit is contained in:
yflory
2017-01-10 15:07:48 +01:00
parent 2be5db9540 63b9d4e9fd
commit 4278ac7637
17 changed files with 207 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
www/poll/main.js
View File

@@ -22,6 +22,9 @@ define([
var secret = Cryptpad.getSecrets();
var readOnly = secret.keys && !secret.keys.editKeyStr;
if (!secret.keys) {
secret.keys = secret.key;
}
Cryptpad.addLoadingScreen();
var onConnectError = function (info) {
@@ -361,12 +364,19 @@ define([
if (proxy && proxy.version === 1) { return; }
console.log("Configuring proxy schema...");
proxy.info = schema.info;
proxy.table = schema.table;
proxy.info = proxy.info || schema.info;
Object.keys(schema.info).forEach(function (k) {
if (!proxy.info[k]) { proxy.info[k] = schema.info[k]; }
});
proxy.table = proxy.table || schema.table;
Object.keys(schema.table).forEach(function (k) {
if (!proxy.table[k]) { proxy.table[k] = schema.table[k]; }
});
proxy.version = 1;
};
/*
*/
@@ -642,7 +652,7 @@ define([
suggestName: suggestName
},
ifrw: window,
common: Cryptpad
common: Cryptpad,
};
var toolbar = info.realtime.toolbar = Toolbar.create(APP.$bar, info.myID, info.realtime, info.getLag, userList, config);