Merge branch 'soon' into staging
commit
56a871cb67
|
@ -32,7 +32,7 @@ server {
|
|||
set $scriptSrc "'self'";
|
||||
set $connectSrc "'self' wss://cryptpad.fr wss://api.cryptpad.fr";
|
||||
set $fontSrc "'self'";
|
||||
set $imgSrc "data: *";
|
||||
set $imgSrc "data: * blob:";
|
||||
set $frameSrc "'self' beta.cryptpad.fr";
|
||||
|
||||
if ($uri = /pad/inner.html) {
|
||||
|
@ -65,8 +65,12 @@ server {
|
|||
rewrite ^.*$ /customize/api/config break;
|
||||
}
|
||||
|
||||
location ^~ /blob/ {
|
||||
try_files $uri =404;
|
||||
}
|
||||
|
||||
## TODO fix in the code so that we don't need this
|
||||
location ~ ^/(register|login|settings|user|pad|drive|poll|slide|code|whiteboard)$ {
|
||||
location ~ ^/(register|login|settings|user|pad|drive|poll|slide|code|whiteboard|file|media)$ {
|
||||
rewrite ^(.*)$ $1/ redirect;
|
||||
}
|
||||
|
||||
|
|
|
@ -7,14 +7,16 @@ define(function () {
|
|||
var userData = exp.userData = {};
|
||||
var userList = exp.userList = info.userList;
|
||||
var myData = exp.myData = {};
|
||||
var myUserName = exp.myUserName = info.myID;
|
||||
var myNetfluxId = exp.myNetfluxId = info.myID;
|
||||
exp.myUserName = info.myID;
|
||||
exp.myNetfluxId = info.myID;
|
||||
|
||||
var network = Cryptpad.getNetwork();
|
||||
|
||||
var parsed = Cryptpad.parsePadUrl(window.location.href);
|
||||
var appType = parsed ? parsed.type : undefined;
|
||||
|
||||
var users = userList.users;
|
||||
var addToUserData = exp.addToUserData = function(data) {
|
||||
var users = userList.users;
|
||||
for (var attrname in data) { userData[attrname] = data[attrname]; }
|
||||
|
||||
if (users && users.length) {
|
||||
|
@ -34,7 +36,7 @@ define(function () {
|
|||
return {
|
||||
data: userData,
|
||||
list: userList,
|
||||
userNetfluxId: myNetfluxId
|
||||
userNetfluxId: exp.myNetfluxId
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -44,13 +46,14 @@ define(function () {
|
|||
if(myUserNameTemp.length > 32) {
|
||||
myUserNameTemp = myUserNameTemp.substr(0, 32);
|
||||
}
|
||||
myUserName = myUserNameTemp;
|
||||
myData[myNetfluxId] = {
|
||||
name: myUserName,
|
||||
exp.myUserName = myUserNameTemp;
|
||||
myData = {};
|
||||
myData[exp.myNetfluxId] = {
|
||||
name: exp.myUserName,
|
||||
uid: Cryptpad.getUid(),
|
||||
};
|
||||
addToUserData(myData);
|
||||
Cryptpad.setAttribute('username', myUserName, function (err) {
|
||||
Cryptpad.setAttribute('username', exp.myUserName, function (err) {
|
||||
if (err) {
|
||||
console.log("Couldn't set username");
|
||||
console.error(err);
|
||||
|
@ -72,7 +75,7 @@ define(function () {
|
|||
if (typeof(lastName) === 'string') {
|
||||
setName(lastName, onLocal);
|
||||
} else {
|
||||
myData[myNetfluxId] = {
|
||||
myData[exp.myNetfluxId] = {
|
||||
name: "",
|
||||
uid: Cryptpad.getUid(),
|
||||
};
|
||||
|
@ -90,6 +93,11 @@ define(function () {
|
|||
setName(newName, onLocal);
|
||||
});
|
||||
|
||||
network.on('reconnect', function (uid) {
|
||||
exp.myNetfluxId = uid;
|
||||
exp.setName(exp.myUserName);
|
||||
});
|
||||
|
||||
return exp;
|
||||
};
|
||||
|
||||
|
|
|
@ -2369,7 +2369,7 @@ define([
|
|||
module.hideMenu();
|
||||
});
|
||||
|
||||
$appContainer.on('click', function (e) {
|
||||
$appContainer.on('mousedown', function (e) {
|
||||
if (e.which !== 1) { return ; }
|
||||
removeSelected(e);
|
||||
removeInput();
|
||||
|
|
|
@ -90,6 +90,7 @@ define([
|
|||
|
||||
var newU8 = FileCrypto.joinChunks(chunks);
|
||||
FileCrypto.decrypt(newU8, key, function (e, res) {
|
||||
if (e) { return console.error(e); }
|
||||
var title = document.title = res.metadata.name;
|
||||
myFile = res.content;
|
||||
myDataType = res.metadata.type;
|
||||
|
@ -218,12 +219,15 @@ define([
|
|||
var key = Nacl.util.decodeBase64(cryptKey);
|
||||
|
||||
FileCrypto.decrypt(u8, key, function (e, data) {
|
||||
if (e) {
|
||||
Cryptpad.removeLoadingScreen();
|
||||
return console.error(e);
|
||||
}
|
||||
console.log(data);
|
||||
var title = document.title = data.metadata.name;
|
||||
myFile = data.content;
|
||||
myDataType = data.metadata.type;
|
||||
updateTitle(title || defaultName);
|
||||
|
||||
Cryptpad.removeLoadingScreen();
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue