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

Remove unnecessary logs when logging in

Browse Source
This commit is contained in:
yflory 2018-06-11 11:23:11 +02:00
parent 921e6eb3c3
commit 8f28621bb0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/mergeDrive.js
View File

@ -109,7 +109,7 @@ define([
pinPads: function () {} // without pinPads /outer/userObject.js won't be loaded pinPads: function () {} // without pinPads /outer/userObject.js won't be loaded
}); });
var onMigrated = function () { var onMigrated = function () {
oldFo.fixFiles(); oldFo.fixFiles(true);
var newFo = proxyData.userObject; var newFo = proxyData.userObject;
var oldRecentPads = parsed.drive[newFo.FILES_DATA]; var oldRecentPads = parsed.drive[newFo.FILES_DATA];
var newRecentPads = proxy.drive[newFo.FILES_DATA]; var newRecentPads = proxy.drive[newFo.FILES_DATA];

5
www/common/outer/userObject.js
View File

@ -426,7 +426,7 @@ define([
migrateToNewFormat(cb); migrateToNewFormat(cb);
}; };
exp.fixFiles = function () { exp.fixFiles = function (silent) {
// Explore the tree and check that everything is correct: // Explore the tree and check that everything is correct:
// * 'root', 'trash', 'unsorted' and 'filesData' exist and are objects // * 'root', 'trash', 'unsorted' and 'filesData' exist and are objects
// * ROOT: Folders are objects, files are href // * ROOT: Folders are objects, files are href
@ -435,6 +435,9 @@ define([
// - Dates (adate, cdate) can be parsed/formatted // - Dates (adate, cdate) can be parsed/formatted
// - All files in filesData should be either in 'root', 'trash' or 'unsorted'. If that's not the case, copy the fily to 'unsorted' // - All files in filesData should be either in 'root', 'trash' or 'unsorted'. If that's not the case, copy the fily to 'unsorted'
// * TEMPLATE: Contains only files (href), and does not contains files that are in ROOT // * TEMPLATE: Contains only files (href), and does not contains files that are in ROOT
if (silent) { debug = function () {}; }
debug("Cleaning file system..."); debug("Cleaning file system...");
var before = JSON.stringify(files); var before = JSON.stringify(files);