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

Merge branch 'staging' into cacheRT

pull/1/head
yflory 2020-12-04 11:16:07 +01:00
parent a857a0e3d4 5b734ce48d
commit b636209d3e
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/admin/inner.js
View File

@ -120,7 +120,8 @@ define([
Messages.admin_archiveInput = "Document URL";
Messages.admin_archiveInput2 = "Document password";
Messages.admin_archiveInval = "Invalid document";
Messages.restoredFromServer = "Pad restored";
Messages.restoredFromServer = "Document restored";
Messages.archivedFromServer = "Document archived";
var archiveForm = function (archive, $div, $button) {
var label = h('label', { for: 'cp-admin-archive' }, Messages.admin_archiveInput);
@ -221,7 +222,7 @@ define([
console.error(e);
return;
}
UI.log(archive ? Messages.deletedFromServer : Messages.restoredFromServer);
UI.log(archive ? Messages.archivedFromServer : Messages.restoredFromServer);
$input.val('');
$pwInput.val('');
});

3
www/common/common-messaging.js
View File

@ -91,7 +91,7 @@ define([
Msg.updateMyData = function (store, curve) {
var myData = createData(store.proxy, false);
if (store.proxy.friends) {
store.proxy.friends.me = myData;
store.proxy.friends.me = Util.clone(myData);
delete store.proxy.friends.me.channel;
}
if (store.modules['team']) {
@ -99,6 +99,7 @@ define([
}
var todo = function (friend) {
if (!friend || !friend.notifications) { return; }
delete friend.user;
myData.channel = friend.channel;
store.mailbox.sendTo('UPDATE_DATA', myData, {
channel: friend.notifications,

4
www/common/sframe-common-outer.js
View File

@ -8,7 +8,7 @@ define([
], function (nThen, ApiConfig, RequireConfig, Messages, $) {
var common = {};
common.initIframe = function (waitFor, isRt) {
common.initIframe = function (waitFor, isRt, pathname) {
var requireConfig = RequireConfig();
var lang = Messages._languageUsed;
var req = {
@ -31,7 +31,7 @@ define([
}
document.getElementById('sbox-iframe').setAttribute('src',
ApiConfig.httpSafeOrigin + window.location.pathname + 'inner.html?' +
ApiConfig.httpSafeOrigin + (pathname || window.location.pathname) + 'inner.html?' +
requireConfig.urlArgs + '#' + encodeURIComponent(JSON.stringify(req)));
// This is a cheap trick to avoid loading sframe-channel in parallel with the