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

Merge branch 'staging' into newDrive

pull/1/head
yflory 2017-06-09 14:40:26 +02:00
parent 78e6118153 7f120c8fc1
commit 9ca10ba524
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/translations/messages.fr.js
View File

@ -283,6 +283,8 @@ define(function () {
out.fo_unableToRestore = "Impossible de restaurer ce fichier à son emplacement d'origine. Vous pouvez essayer de le déplacer à un nouvel emplacement.";
out.fo_unavailableName = "Un fichier ou dossier avec le même nom existe déjà au nouvel emplacement. Renommez cet élément avant d'essayer à nouveau.";
out.fs_migration = "Votre CryptDrive est en train d'être mis à jour vers une nouvelle version. Cela implique que cette page doive être rechargée.<br><strong>Veuillez recharger la page pour pouvoir continuer à l'utiliser.</<strong>";
// login
out.login_login = "Connexion";
out.login_makeAPad = 'Créer un pad anonymement';

2
customize.dist/translations/messages.js
View File

@ -285,6 +285,8 @@ define(function () {
out.fo_unableToRestore = "Unable to restore that file to its original location. You can try to move it to a new location.";
out.fo_unavailableName = "A file or a folder with the same name already exist at the new location. Rename the element and try again.";
out.fs_migration = "Your CryptDrive is being updated to a new version. As a result, the current page has to be reloaded.<br><strong>Please reload this page to continue to use it.</strong>";
// login
out.login_login = "Log in";
out.login_makeAPad = 'Create a pad anonymously';

10
www/common/fsStore.js
View File

@ -297,19 +297,15 @@ define([
return;
}
})
.on('change', [], function () {
.on('change', ['drive', 'migrate'], function () {
var path = arguments[2];
var value = arguments[1];
console.log('abcd');
console.log(arguments);
if (path[0] === 'drive' && path[1] === "migrate" && value === 1) {
console.log('PEWPEWPEW');
if (path[0] === 'drive' && path[1] === "migrate" && value == 1) {
rt.network.disconnect();
rt.realtime.abort();
Cryptpad.alert("Disconnected while migration");
Cryptpad.alert(Cryptpad.Messages.fs_migration);
}
});
};
Store.ready = function (f, Cryptpad) {

1
www/drive/main.js
View File

@ -2504,7 +2504,6 @@ define([
module.resetTree();
return false;
}).on('change', ['drive', 'migrate'], function () {
console.log('OKOKOK');
var path = arguments[2];
var value = arguments[1];
if (path[1] === "migrate" && value === 1) {