Merge branch 'coati' into kanban
yflory
7 years ago
commit
037050d16f
@ -0,0 +1,47 @@
|
|||||||
|
# 1.29.0
|
||||||
|
|
||||||
|
**Goals**
|
||||||
|
|
||||||
|
For this release we wanted to direct our effort towards improving user experience issues surrounding user accounts.
|
||||||
|
|
||||||
|
**Update notes**
|
||||||
|
|
||||||
|
This release features breaking changes to some clientside dependencies. Administrators must make sure to deploy the
|
||||||
|
latest server with npm update before updating your clientside dependencies with bower update.
|
||||||
|
|
||||||
|
**What's new**
|
||||||
|
|
||||||
|
* newly registered users are now able to delete their accounts automatically, along with any personal
|
||||||
|
information which had been created:
|
||||||
|
* ToDo list data is automatically deleted, along with user profiles
|
||||||
|
* all of a user's owned pads are also removed immediately in their account deletion process
|
||||||
|
* users who predate account deletion will not benefit from automatic account deletion, since the server
|
||||||
|
does not have sufficient knowledge to guarantee that the information they could request to have deleted is strictly
|
||||||
|
their own. For this reason, we've started working on scripts for validating user requests, so as to enable manual
|
||||||
|
deletion by the server administrator.
|
||||||
|
* the script can be found in cryptpad/check-account-deletion.js, and it will be a part of an ongoing
|
||||||
|
effort to improve administrator tooling for situations like this
|
||||||
|
* users who have not logged in, but wish to use their drive now see a ghost icon which they can use to create pads.
|
||||||
|
We hope this makes it easier to get started as a new user.
|
||||||
|
* registered users who have saved templates in their drives can now use those templates at any time, rather than only
|
||||||
|
using them to create new pads
|
||||||
|
* we've updated our file encryption code such that it does not interfere with other scripts which may be running at
|
||||||
|
the same time (synchronous blocking, for those who are interested)
|
||||||
|
* we now validate message signatures clientside, except when they are coming from the history keeper because clients
|
||||||
|
trust that the server has already validated those signatures
|
||||||
|
|
||||||
|
**Bug fixes**
|
||||||
|
* we've removed some dependencies from our home page that were introduced when we updated to use bootstrap4
|
||||||
|
* we now import fontawesome as css, and not less, which saves processing time and saves room in our localStorage cache
|
||||||
|
* templates which do not have a 'type' attribute set are migrated such that the pads which are created with their
|
||||||
|
content are valid
|
||||||
|
* thumbnail creation for pads is now disabled by default, due to poor performance
|
||||||
|
* users can enable thumbnail creation in their settings page
|
||||||
|
* we've fixed a significant bug in how our server handles checkpoints (special patches in history which contain the
|
||||||
|
entire pads content)
|
||||||
|
* it was possible for two users to independently create checkpoints in close proximity while the document was in a
|
||||||
|
forked state. New users joining while the session was in this state would get stuck on one side of the fork,
|
||||||
|
and could lose data if the users on the opposing fork overrode their changes
|
||||||
|
* we've updated our tests, which have been failing for some time because their success conditions were no longer valid
|
||||||
|
* while trying to register a previously registered user, users could cancel the prompt to login as that user.
|
||||||
|
If they did so, the registration form remained locked. This has been fixed.
|
||||||
@ -0,0 +1,76 @@
|
|||||||
|
/* jshint esversion: 6, node: true */
|
||||||
|
const Fs = require('fs');
|
||||||
|
const nThen = require('nthen');
|
||||||
|
const Pinned = require('./pinned');
|
||||||
|
const Nacl = require('tweetnacl');
|
||||||
|
|
||||||
|
const hashesFromPinFile = (pinFile, fileName) => {
|
||||||
|
var pins = {};
|
||||||
|
pinFile.split('\n').filter((x)=>(x)).map((l) => JSON.parse(l)).forEach((l) => {
|
||||||
|
switch (l[0]) {
|
||||||
|
case 'RESET': {
|
||||||
|
pins = {};
|
||||||
|
if (l[1] && l[1].length) { l[1].forEach((x) => { pins[x] = 1; }); }
|
||||||
|
//jshint -W086
|
||||||
|
// fallthrough
|
||||||
|
}
|
||||||
|
case 'PIN': {
|
||||||
|
l[1].forEach((x) => { pins[x] = 1; });
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case 'UNPIN': {
|
||||||
|
l[1].forEach((x) => { delete pins[x]; });
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
default: throw new Error(JSON.stringify(l) + ' ' + fileName);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return Object.keys(pins);
|
||||||
|
};
|
||||||
|
|
||||||
|
var escapeKeyCharacters = function (key) {
|
||||||
|
return key && key.replace && key.replace(/\//g, '-');
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
const dataIdx = process.argv.indexOf('--data');
|
||||||
|
let edPublic;
|
||||||
|
if (dataIdx === -1) {
|
||||||
|
const hasEdPublic = process.argv.indexOf('--ed');
|
||||||
|
if (hasEdPublic === -1) { return void console.error("Missing ed argument"); }
|
||||||
|
edPublic = escapeKeyCharacters(process.argv[hasEdPublic+1]);
|
||||||
|
} else {
|
||||||
|
const deleteData = JSON.parse(process.argv[dataIdx+1]);
|
||||||
|
if (!deleteData.toSign || !deleteData.proof) { return void console.error("Invalid arguments"); }
|
||||||
|
// Check sig
|
||||||
|
const ed = Nacl.util.decodeBase64(deleteData.toSign.edPublic);
|
||||||
|
const signed = Nacl.util.decodeUTF8(JSON.stringify(deleteData.toSign));
|
||||||
|
const proof = Nacl.util.decodeBase64(deleteData.proof);
|
||||||
|
if (!Nacl.sign.detached.verify(signed, proof, ed)) { return void console.error("Invalid signature"); }
|
||||||
|
edPublic = escapeKeyCharacters(deleteData.toSign.edPublic);
|
||||||
|
}
|
||||||
|
|
||||||
|
let data = [];
|
||||||
|
let pinned = [];
|
||||||
|
|
||||||
|
nThen((waitFor) => {
|
||||||
|
let f = './pins/' + edPublic.slice(0, 2) + '/' + edPublic + '.ndjson';
|
||||||
|
Fs.readFile(f, waitFor((err, content) => {
|
||||||
|
if (err) { throw err; }
|
||||||
|
pinned = hashesFromPinFile(content.toString('utf8'), f);
|
||||||
|
}));
|
||||||
|
}).nThen((waitFor) => {
|
||||||
|
Pinned.load(waitFor((d) => {
|
||||||
|
data = Object.keys(d);
|
||||||
|
}), {
|
||||||
|
exclude: [edPublic + '.ndjson']
|
||||||
|
});
|
||||||
|
}).nThen(() => {
|
||||||
|
console.log('Pads pinned by this user and not pinned by anybody else:');
|
||||||
|
pinned.forEach((p) => {
|
||||||
|
if (data.indexOf(p) === -1) {
|
||||||
|
console.log(p);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 23 KiB |
@ -0,0 +1,201 @@
|
|||||||
|
// dark #326599
|
||||||
|
// light #4591c4
|
||||||
|
define([], function () {
|
||||||
|
var loadingStyle = (function(){/*
|
||||||
|
#cp-loading {
|
||||||
|
transition: opacity 0.75s, visibility 0s 0.75s;
|
||||||
|
visibility: visible;
|
||||||
|
position: fixed;
|
||||||
|
z-index: 10000000;
|
||||||
|
top: 0px;
|
||||||
|
bottom: 0px;
|
||||||
|
left: 0px;
|
||||||
|
right: 0px;
|
||||||
|
background: linear-gradient(to right, #326599 0%, #326599 50%, #4591c4 50%, #4591c4 100%);
|
||||||
|
color: #fafafa;
|
||||||
|
font-size: 1.5em;
|
||||||
|
opacity: 1;
|
||||||
|
display: flex;
|
||||||
|
flex-flow: column;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
#cp-loading.cp-loading-hidden {
|
||||||
|
opacity: 0;
|
||||||
|
visibility: hidden;
|
||||||
|
}
|
||||||
|
#cp-loading .cp-loading-logo {
|
||||||
|
height: 300px;
|
||||||
|
width: 300px;
|
||||||
|
margin-top: 50px;
|
||||||
|
flex: 0 1 auto;
|
||||||
|
min-height: 0;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
#cp-loading .cp-loading-logo img {
|
||||||
|
max-width: 100%;
|
||||||
|
max-height: 100%;
|
||||||
|
}
|
||||||
|
#cp-loading .cp-loading-container {
|
||||||
|
width: 700px;
|
||||||
|
max-width: 90vw;
|
||||||
|
height: 500px;
|
||||||
|
max-height: calc(100vh - 20px);
|
||||||
|
margin: 50px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
display: flex;
|
||||||
|
flex-flow: column;
|
||||||
|
justify-content: center;
|
||||||
|
justify-content: space-evenly;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
@media screen and (max-height: 800px) {
|
||||||
|
#cp-loading .cp-loading-container {
|
||||||
|
height: auto;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@media screen and (max-width: 600px) {
|
||||||
|
#cp-loading .cp-loading-container {
|
||||||
|
height: auto;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#cp-loading .cp-loading-cryptofist {
|
||||||
|
margin-left: auto;
|
||||||
|
margin-right: auto;
|
||||||
|
//height: 300px;
|
||||||
|
max-width: 90vw;
|
||||||
|
max-height: 300px;
|
||||||
|
width: auto;
|
||||||
|
height: auto;
|
||||||
|
margin-bottom: 2em;
|
||||||
|
}
|
||||||
|
@media screen and (max-height: 500px) {
|
||||||
|
#cp-loading .cp-loading-logo {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#cp-loading-message {
|
||||||
|
background: #FFF;
|
||||||
|
padding: 20px;
|
||||||
|
width: 100%;
|
||||||
|
color: #000;
|
||||||
|
text-align: center;
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
#cp-loading-password-prompt {
|
||||||
|
font-size: 18px;
|
||||||
|
}
|
||||||
|
#cp-loading-password-prompt .cp-password-error {
|
||||||
|
color: white;
|
||||||
|
background: #9e0000;
|
||||||
|
padding: 5px;
|
||||||
|
margin-bottom: 15px;
|
||||||
|
}
|
||||||
|
#cp-loading-password-prompt .cp-password-info {
|
||||||
|
text-align: left;
|
||||||
|
margin-bottom: 15px;
|
||||||
|
}
|
||||||
|
#cp-loading-password-prompt .cp-password-form {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-around;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
#cp-loading-password-prompt .cp-password-form button,
|
||||||
|
#cp-loading-password-prompt .cp-password-form .cp-password-input {
|
||||||
|
background-color: #4591c4;
|
||||||
|
color: white;
|
||||||
|
border: 1px solid #4591c4;
|
||||||
|
}
|
||||||
|
#cp-loading-password-prompt .cp-password-form .cp-password-container {
|
||||||
|
flex-shrink: 1;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
#cp-loading-password-prompt .cp-password-form input {
|
||||||
|
flex: 1;
|
||||||
|
padding: 0 5px;
|
||||||
|
min-width: 0;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
#cp-loading-password-prompt .cp-password-form button:hover {
|
||||||
|
background-color: #326599;
|
||||||
|
}
|
||||||
|
#cp-loading .cp-loading-spinner-container {
|
||||||
|
position: relative;
|
||||||
|
height: 100px;
|
||||||
|
}
|
||||||
|
#cp-loading .cp-loading-spinner-container > div {
|
||||||
|
height: 100px;
|
||||||
|
}
|
||||||
|
#cp-loading-tip {
|
||||||
|
position: fixed;
|
||||||
|
z-index: 10000000;
|
||||||
|
top: 80%;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
text-align: center;
|
||||||
|
transition: opacity 750ms;
|
||||||
|
transition-delay: 3000ms;
|
||||||
|
}
|
||||||
|
@media screen and (max-height: 600px) {
|
||||||
|
#cp-loading-tip {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#cp-loading-tip span {
|
||||||
|
background: #222;
|
||||||
|
color: #fafafa;
|
||||||
|
text-align: center;
|
||||||
|
font-size: 1.5em;
|
||||||
|
opacity: 0.7;
|
||||||
|
font-family: 'Open Sans', 'Helvetica Neue', sans-serif;
|
||||||
|
padding: 15px;
|
||||||
|
max-width: 60%;
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
|
.cp-loading-progress {
|
||||||
|
width: 100%;
|
||||||
|
margin: 20px;
|
||||||
|
}
|
||||||
|
.cp-loading-progress p {
|
||||||
|
margin: 5px;
|
||||||
|
overflow: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
.cp-loading-progress-bar {
|
||||||
|
height: 24px;
|
||||||
|
background: white;
|
||||||
|
}
|
||||||
|
.cp-loading-progress-bar-value {
|
||||||
|
height: 100%;
|
||||||
|
background: #5cb85c;
|
||||||
|
}
|
||||||
|
*/}).toString().slice(14, -3);
|
||||||
|
var urlArgs = window.location.href.replace(/^.*\?([^\?]*)$/, function (all, x) { return x; });
|
||||||
|
var elem = document.createElement('div');
|
||||||
|
elem.setAttribute('id', 'cp-loading');
|
||||||
|
elem.innerHTML = [
|
||||||
|
'<style>',
|
||||||
|
loadingStyle,
|
||||||
|
'</style>',
|
||||||
|
'<div class="cp-loading-logo">',
|
||||||
|
'<img class="cp-loading-cryptofist" src="/customize/loading-logo.png?' + urlArgs + '">',
|
||||||
|
'</div>',
|
||||||
|
'<div class="cp-loading-container">',
|
||||||
|
'<div class="cp-loading-spinner-container">',
|
||||||
|
'<span class="fa fa-circle-o-notch fa-spin fa-4x fa-fw"></span>',
|
||||||
|
'</div>',
|
||||||
|
'<p id="cp-loading-message"></p>',
|
||||||
|
'</div>'
|
||||||
|
].join('');
|
||||||
|
return function () {
|
||||||
|
var intr;
|
||||||
|
var append = function () {
|
||||||
|
if (!document.body) { return; }
|
||||||
|
clearInterval(intr);
|
||||||
|
document.body.appendChild(elem);
|
||||||
|
};
|
||||||
|
intr = setInterval(append, 100);
|
||||||
|
append();
|
||||||
|
};
|
||||||
|
});
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
.password_main() {
|
||||||
|
.cp-password-container {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
input {
|
||||||
|
flex: 1;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
label, .fa {
|
||||||
|
margin-left: 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,14 @@
|
|||||||
|
@import (once) './colortheme-all.less';
|
||||||
|
|
||||||
|
.tippy_main() {
|
||||||
|
.tippy-tooltip.cryptpad-theme {
|
||||||
|
/* Your styling here. Example: */
|
||||||
|
background-color: white;
|
||||||
|
box-shadow: 2px 2px 10px #000;
|
||||||
|
font-weight: bold;
|
||||||
|
color: #333;
|
||||||
|
[x-circle] {
|
||||||
|
background-color: unset;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,73 +0,0 @@
|
|||||||
/*
|
|
||||||
WARNING: THIS FILE DOES NOTHING
|
|
||||||
It exists only as a proposal of what CSS you should use in loading.js
|
|
||||||
The CSS inside of loading.js is precompiled in order to save 200ish milliseconds to the loading screen.
|
|
||||||
*/
|
|
||||||
@import (once) "./include/colortheme-all.less";
|
|
||||||
@import (once) "./include/browser.less";
|
|
||||||
|
|
||||||
#cp-loading {
|
|
||||||
transition: opacity 0.75s, visibility 0s 0.75s;
|
|
||||||
visibility: visible;
|
|
||||||
opacity: 1;
|
|
||||||
position: fixed;
|
|
||||||
z-index: 10000000; // #loading
|
|
||||||
top: 0px;
|
|
||||||
bottom: 0px;
|
|
||||||
left: 0px;
|
|
||||||
right: 0px;
|
|
||||||
background: @colortheme_loading-bg;
|
|
||||||
color: @colortheme_loading-color;
|
|
||||||
text-align: center;
|
|
||||||
font-size: 1.5em;
|
|
||||||
.cp-loading-container {
|
|
||||||
margin-top: 50vh;
|
|
||||||
transform: translateY(-50%);
|
|
||||||
}
|
|
||||||
.cp-loading-cryptofist {
|
|
||||||
margin-left: auto;
|
|
||||||
margin-right: auto;
|
|
||||||
height: 300px;
|
|
||||||
margin-bottom: 2em;
|
|
||||||
@media screen and (max-height: @browser_media-short-screen) {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.cp-loading-spinner-container {
|
|
||||||
position: relative;
|
|
||||||
height: 100px;
|
|
||||||
> div {
|
|
||||||
height: 100px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
&.cp-loading-hidden {
|
|
||||||
opacity: 0;
|
|
||||||
visibility: hidden;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#cp-loading-tip {
|
|
||||||
position: fixed;
|
|
||||||
z-index: 10000000; // loading tip
|
|
||||||
top: 80%;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
text-align: center;
|
|
||||||
|
|
||||||
transition: opacity 750ms;
|
|
||||||
transition-delay: 3000ms;
|
|
||||||
@media screen and (max-height: @browser_media-medium-screen) {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
span {
|
|
||||||
background: @colortheme_loading-bg;
|
|
||||||
color: @colortheme_loading-color;
|
|
||||||
text-align: center;
|
|
||||||
font-size: 1.5em;
|
|
||||||
opacity: 0.7;
|
|
||||||
font-family: @colortheme_font;
|
|
||||||
padding: 15px;
|
|
||||||
max-width: 60%;
|
|
||||||
display: inline-block;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,94 +1,3 @@
|
|||||||
define([], function () {
|
require(['/customize/loading.js'], function (Loading) {
|
||||||
var loadingStyle = (function(){/*
|
Loading();
|
||||||
#cp-loading {
|
|
||||||
transition: opacity 0.75s, visibility 0s 0.75s;
|
|
||||||
visibility: visible;
|
|
||||||
position: fixed;
|
|
||||||
z-index: 10000000;
|
|
||||||
top: 0px;
|
|
||||||
bottom: 0px;
|
|
||||||
left: 0px;
|
|
||||||
right: 0px;
|
|
||||||
background: #222;
|
|
||||||
color: #fafafa;
|
|
||||||
text-align: center;
|
|
||||||
font-size: 1.5em;
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
#cp-loading.cp-loading-hidden {
|
|
||||||
opacity: 0;
|
|
||||||
visibility: hidden;
|
|
||||||
}
|
|
||||||
#cp-loading .cp-loading-container {
|
|
||||||
margin-top: 50vh;
|
|
||||||
transform: translateY(-50%);
|
|
||||||
}
|
|
||||||
#cp-loading .cp-loading-cryptofist {
|
|
||||||
margin-left: auto;
|
|
||||||
margin-right: auto;
|
|
||||||
height: 300px;
|
|
||||||
margin-bottom: 2em;
|
|
||||||
}
|
|
||||||
@media screen and (max-height: 450px) {
|
|
||||||
#cp-loading .cp-loading-cryptofist {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#cp-loading .cp-loading-spinner-container {
|
|
||||||
position: relative;
|
|
||||||
height: 100px;
|
|
||||||
}
|
|
||||||
#cp-loading .cp-loading-spinner-container > div {
|
|
||||||
height: 100px;
|
|
||||||
}
|
|
||||||
#cp-loading-tip {
|
|
||||||
position: fixed;
|
|
||||||
z-index: 10000000;
|
|
||||||
top: 80%;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
text-align: center;
|
|
||||||
transition: opacity 750ms;
|
|
||||||
transition-delay: 3000ms;
|
|
||||||
}
|
|
||||||
@media screen and (max-height: 600px) {
|
|
||||||
#cp-loading-tip {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#cp-loading-tip span {
|
|
||||||
background: #222;
|
|
||||||
color: #fafafa;
|
|
||||||
text-align: center;
|
|
||||||
font-size: 1.5em;
|
|
||||||
opacity: 0.7;
|
|
||||||
font-family: 'Open Sans', 'Helvetica Neue', sans-serif;
|
|
||||||
padding: 15px;
|
|
||||||
max-width: 60%;
|
|
||||||
display: inline-block;
|
|
||||||
}
|
|
||||||
*/}).toString().slice(14, -3);
|
|
||||||
var urlArgs = window.location.href.replace(/^.*\?([^\?]*)$/, function (all, x) { return x; });
|
|
||||||
var elem = document.createElement('div');
|
|
||||||
elem.setAttribute('id', 'cp-loading');
|
|
||||||
elem.innerHTML = [
|
|
||||||
'<style>',
|
|
||||||
loadingStyle,
|
|
||||||
'</style>',
|
|
||||||
'<div class="cp-loading-container">',
|
|
||||||
'<img class="cp-loading-cryptofist" src="/customize/cryptpad-new-logo-colors-logoonly.png?' + urlArgs + '">',
|
|
||||||
'<div class="cp-loading-spinner-container">',
|
|
||||||
'<span class="fa fa-circle-o-notch fa-spin fa-4x fa-fw"></span>',
|
|
||||||
'</div>',
|
|
||||||
'<p id="cp-loading-message"></p>',
|
|
||||||
'</div>'
|
|
||||||
].join('');
|
|
||||||
var intr;
|
|
||||||
var append = function () {
|
|
||||||
if (!document.body) { return; }
|
|
||||||
clearInterval(intr);
|
|
||||||
document.body.appendChild(elem);
|
|
||||||
};
|
|
||||||
intr = setInterval(append, 100);
|
|
||||||
append();
|
|
||||||
});
|
});
|
||||||
|
|||||||
@ -1,106 +1,152 @@
|
|||||||
define(['/common/common-feedback.js'], function (Feedback) {
|
define([
|
||||||
|
'/common/common-feedback.js',
|
||||||
|
'/common/common-hash.js',
|
||||||
|
'/common/common-util.js',
|
||||||
|
'/bower_components/nthen/index.js',
|
||||||
|
], function (Feedback, Hash, Util, nThen) {
|
||||||
// Start migration check
|
// Start migration check
|
||||||
// Versions:
|
// Versions:
|
||||||
// 1: migrate pad attributes
|
// 1: migrate pad attributes
|
||||||
// 2: migrate indent settings (codemirror)
|
// 2: migrate indent settings (codemirror)
|
||||||
|
|
||||||
return function (userObject) {
|
return function (userObject, cb, progress) {
|
||||||
var version = userObject.version || 0;
|
var version = userObject.version || 0;
|
||||||
|
|
||||||
// DEPRECATED
|
nThen(function () {
|
||||||
// Migration 1: pad attributes moved to filesData
|
// DEPRECATED
|
||||||
var migratePadAttributesToData = function () {
|
// Migration 1: pad attributes moved to filesData
|
||||||
return true;
|
var migratePadAttributesToData = function () {
|
||||||
};
|
return true;
|
||||||
if (version < 1) {
|
};
|
||||||
migratePadAttributesToData();
|
if (version < 1) {
|
||||||
}
|
migratePadAttributesToData();
|
||||||
|
|
||||||
// Migration 2: global attributes from root to 'settings' subobjects
|
|
||||||
var migrateAttributes = function () {
|
|
||||||
var drawer = 'cryptpad.userlist-drawer';
|
|
||||||
var polls = 'cryptpad.hide_poll_text';
|
|
||||||
var indentKey = 'cryptpad.indentUnit';
|
|
||||||
var useTabsKey = 'cryptpad.indentWithTabs';
|
|
||||||
var settings = userObject.settings = userObject.settings || {};
|
|
||||||
if (typeof(userObject[indentKey]) !== "undefined") {
|
|
||||||
settings.codemirror = settings.codemirror || {};
|
|
||||||
settings.codemirror.indentUnit = userObject[indentKey];
|
|
||||||
delete userObject[indentKey];
|
|
||||||
}
|
|
||||||
if (typeof(userObject[useTabsKey]) !== "undefined") {
|
|
||||||
settings.codemirror = settings.codemirror || {};
|
|
||||||
settings.codemirror.indentWithTabs = userObject[useTabsKey];
|
|
||||||
delete userObject[useTabsKey];
|
|
||||||
}
|
}
|
||||||
if (typeof(userObject[drawer]) !== "undefined") {
|
}).nThen(function () {
|
||||||
settings.toolbar = settings.toolbar || {};
|
// Migration 2: global attributes from root to 'settings' subobjects
|
||||||
settings.toolbar['userlist-drawer'] = userObject[drawer];
|
var migrateAttributes = function () {
|
||||||
delete userObject[drawer];
|
var drawer = 'cryptpad.userlist-drawer';
|
||||||
|
var polls = 'cryptpad.hide_poll_text';
|
||||||
|
var indentKey = 'cryptpad.indentUnit';
|
||||||
|
var useTabsKey = 'cryptpad.indentWithTabs';
|
||||||
|
var settings = userObject.settings = userObject.settings || {};
|
||||||
|
if (typeof(userObject[indentKey]) !== "undefined") {
|
||||||
|
settings.codemirror = settings.codemirror || {};
|
||||||
|
settings.codemirror.indentUnit = userObject[indentKey];
|
||||||
|
delete userObject[indentKey];
|
||||||
|
}
|
||||||
|
if (typeof(userObject[useTabsKey]) !== "undefined") {
|
||||||
|
settings.codemirror = settings.codemirror || {};
|
||||||
|
settings.codemirror.indentWithTabs = userObject[useTabsKey];
|
||||||
|
delete userObject[useTabsKey];
|
||||||
|
}
|
||||||
|
if (typeof(userObject[drawer]) !== "undefined") {
|
||||||
|
settings.toolbar = settings.toolbar || {};
|
||||||
|
settings.toolbar['userlist-drawer'] = userObject[drawer];
|
||||||
|
delete userObject[drawer];
|
||||||
|
}
|
||||||
|
if (typeof(userObject[polls]) !== "undefined") {
|
||||||
|
settings.poll = settings.poll || {};
|
||||||
|
settings.poll['hide-text'] = userObject[polls];
|
||||||
|
delete userObject[polls];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
if (version < 2) {
|
||||||
|
migrateAttributes();
|
||||||
|
Feedback.send('Migrate-2', true);
|
||||||
|
userObject.version = version = 2;
|
||||||
}
|
}
|
||||||
if (typeof(userObject[polls]) !== "undefined") {
|
}).nThen(function () {
|
||||||
settings.poll = settings.poll || {};
|
// Migration 3: language from localStorage to settings
|
||||||
settings.poll['hide-text'] = userObject[polls];
|
var migrateLanguage = function () {
|
||||||
delete userObject[polls];
|
if (!localStorage.CRYPTPAD_LANG) { return; }
|
||||||
|
var l = localStorage.CRYPTPAD_LANG;
|
||||||
|
userObject.settings.language = l;
|
||||||
|
};
|
||||||
|
if (version < 3) {
|
||||||
|
migrateLanguage();
|
||||||
|
Feedback.send('Migrate-3', true);
|
||||||
|
userObject.version = version = 3;
|
||||||
}
|
}
|
||||||
};
|
}).nThen(function () {
|
||||||
if (version < 2) {
|
// Migration 4: allowUserFeedback to settings
|
||||||
migrateAttributes();
|
var migrateFeedback = function () {
|
||||||
Feedback.send('Migrate-2', true);
|
var settings = userObject.settings = userObject.settings || {};
|
||||||
userObject.version = version = 2;
|
if (typeof(userObject['allowUserFeedback']) !== "undefined") {
|
||||||
}
|
settings.general = settings.general || {};
|
||||||
|
settings.general.allowUserFeedback = userObject['allowUserFeedback'];
|
||||||
|
delete userObject['allowUserFeedback'];
|
||||||
|
}
|
||||||
// Migration 3: language from localStorage to settings
|
};
|
||||||
var migrateLanguage = function () {
|
if (version < 4) {
|
||||||
if (!localStorage.CRYPTPAD_LANG) { return; }
|
migrateFeedback();
|
||||||
var l = localStorage.CRYPTPAD_LANG;
|
Feedback.send('Migrate-4', true);
|
||||||
userObject.settings.language = l;
|
userObject.version = version = 4;
|
||||||
};
|
|
||||||
if (version < 3) {
|
|
||||||
migrateLanguage();
|
|
||||||
Feedback.send('Migrate-3', true);
|
|
||||||
userObject.version = version = 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Migration 4: allowUserFeedback to settings
|
|
||||||
var migrateFeedback = function () {
|
|
||||||
var settings = userObject.settings = userObject.settings || {};
|
|
||||||
if (typeof(userObject['allowUserFeedback']) !== "undefined") {
|
|
||||||
settings.general = settings.general || {};
|
|
||||||
settings.general.allowUserFeedback = userObject['allowUserFeedback'];
|
|
||||||
delete userObject['allowUserFeedback'];
|
|
||||||
}
|
}
|
||||||
};
|
}).nThen(function () {
|
||||||
if (version < 4) {
|
// Migration 5: dates to Number
|
||||||
migrateFeedback();
|
var migrateDates = function () {
|
||||||
Feedback.send('Migrate-4', true);
|
var data = userObject.drive && userObject.drive.filesData;
|
||||||
userObject.version = version = 4;
|
if (data) {
|
||||||
}
|
for (var id in data) {
|
||||||
|
if (typeof data[id].ctime !== "number") {
|
||||||
|
data[id].ctime = +new Date(data[id].ctime);
|
||||||
|
}
|
||||||
// Migration 5: dates to Number
|
if (typeof data[id].atime !== "number") {
|
||||||
var migrateDates = function () {
|
data[id].atime = +new Date(data[id].atime);
|
||||||
var data = userObject.drive && userObject.drive.filesData;
|
}
|
||||||
if (data) {
|
|
||||||
for (var id in data) {
|
|
||||||
if (typeof data[id].ctime !== "number") {
|
|
||||||
data[id].ctime = +new Date(data[id].ctime);
|
|
||||||
}
|
|
||||||
if (typeof data[id].atime !== "number") {
|
|
||||||
data[id].atime = +new Date(data[id].atime);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
if (version < 5) {
|
||||||
|
migrateDates();
|
||||||
|
Feedback.send('Migrate-5', true);
|
||||||
|
userObject.version = version = 5;
|
||||||
|
}
|
||||||
|
}).nThen(function (waitFor) {
|
||||||
|
var addChannelId = function () {
|
||||||
|
var data = userObject.drive.filesData;
|
||||||
|
var el, parsed;
|
||||||
|
var n = nThen(function () {});
|
||||||
|
var padsLength = Object.keys(data).length;
|
||||||
|
Object.keys(data).forEach(function (k, i) {
|
||||||
|
n = n.nThen(function (w) {
|
||||||
|
setTimeout(w(function () {
|
||||||
|
el = data[k];
|
||||||
|
parsed = Hash.parsePadUrl(el.href);
|
||||||
|
if (!el.href) { return; }
|
||||||
|
if (!el.channel) {
|
||||||
|
if (parsed.hashData && parsed.hashData.type === "file") {
|
||||||
|
// PASSWORD_FILES
|
||||||
|
el.channel = Util.base64ToHex(parsed.hashData.channel);
|
||||||
|
} else {
|
||||||
|
var secret = Hash.getSecrets(parsed.type, parsed.hash, el.password);
|
||||||
|
el.channel = secret.channel;
|
||||||
|
}
|
||||||
|
progress(6, Math.round(100*i/padsLength));
|
||||||
|
console.log('Adding missing channel in filesData ', el.channel);
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
n.nThen(waitFor());
|
||||||
|
};
|
||||||
|
if (version < 6) {
|
||||||
|
addChannelId();
|
||||||
|
Feedback.send('Migrate-6', true);
|
||||||
|
userObject.version = version = 6;
|
||||||
}
|
}
|
||||||
};
|
/*}).nThen(function (waitFor) {
|
||||||
if (version < 5) {
|
// Test progress bar in the loading screen
|
||||||
migrateDates();
|
var i = 0;
|
||||||
Feedback.send('Migrate-5', true);
|
var w = waitFor();
|
||||||
userObject.version = version = 5;
|
var it = setInterval(function () {
|
||||||
}
|
i += 5;
|
||||||
|
if (i >= 100) { w(); clearInterval(it); i = 100;}
|
||||||
|
progress(0, i);
|
||||||
|
}, 500);
|
||||||
|
progress(0, 0);*/
|
||||||
|
}).nThen(function () {
|
||||||
|
cb();
|
||||||
|
});
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue