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

Fix blocker issue when creating an account without migrating

Browse Source
This commit is contained in:
yflory 2017-02-24 16:18:41 +01:00
parent e15a6a347f
commit e040c00557
1 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
www/drive/main.js
View File

@ -724,6 +724,9 @@ define([
var type = Messages.type[hrefData.type] || hrefData.type; var type = Messages.type[hrefData.type] || hrefData.type;
var $title = $('<span>', {'class': 'title listElement', title: data.title}).text(data.title); var $title = $('<span>', {'class': 'title listElement', title: data.title}).text(data.title);
var $type = $('<span>', {'class': 'type listElement', title: type}).text(type); var $type = $('<span>', {'class': 'type listElement', title: type}).text(type);
if (hrefData.hash && Cryptpad.parseHash(hrefData.hash) && Cryptpad.parseHash(hrefData.hash).mode === 'view') {
$type.append(' (' + Messages.readonly+ ')');
}
var $adate = $('<span>', {'class': 'atime listElement', title: getDate(data.atime)}).text(getDate(data.atime)); var $adate = $('<span>', {'class': 'atime listElement', title: getDate(data.atime)}).text(getDate(data.atime));
var $cdate = $('<span>', {'class': 'ctime listElement', title: getDate(data.ctime)}).text(getDate(data.ctime)); var $cdate = $('<span>', {'class': 'ctime listElement', title: getDate(data.ctime)}).text(getDate(data.ctime));
if (displayTitle && !isWorkgroup()) { if (displayTitle && !isWorkgroup()) {
@ -1897,8 +1900,32 @@ define([
APP.resizeTree = undefined; APP.resizeTree = undefined;
}); });
var createReadme = function (proxy, cb) {
if (proxy.initializing) {
var hash = Cryptpad.createRandomHash();
Get.put(hash, Messages.driveReadme, function (e) {
if (e) { console.error(e); }
var href = '/pad/#' + hash;
proxy.drive[UNSORTED].push(href);
proxy.drive[FILES_DATA].push({
href: href,
title: Messages.driveReadmeTitle,
atime: new Date().toISOString(),
ctime: new Date().toISOString()
});
if (typeof(cb) === "function") { cb(); }
});
delete proxy.initializing;
return;
}
if (typeof(cb) === "function") { cb(); }
};
refresh(); createReadme(proxy, function () {
refresh();
APP.userList.onChange();
Cryptpad.removeLoadingScreen();
});
}; };
var setName = APP.setName = function (newName) { var setName = APP.setName = function (newName) {
@ -1941,26 +1968,6 @@ define([
if (typeof(cb) === "function") { cb(); } if (typeof(cb) === "function") { cb(); }
} }
}; };
var createReadme = function (proxy, cb) {
if (proxy.initializing) {
var hash = Cryptpad.createRandomHash();
Get.put(hash, Messages.driveReadme, function (e) {
if (e) { console.error(e); }
var href = '/pad/#' + hash;
proxy.drive[UNSORTED].push(href);
proxy.drive[FILES_DATA].push({
href: href,
title: Messages.driveReadmeTitle,
atime: new Date().toISOString(),
ctime: new Date().toISOString()
});
if (typeof(cb) === "function") { cb(); }
});
delete proxy.initializing;
return;
}
if (typeof(cb) === "function") { cb(); }
};
// don't initialize until the store is ready. // don't initialize until the store is ready.
Cryptpad.ready(function () { Cryptpad.ready(function () {
@ -2056,12 +2063,10 @@ define([
module.files = proxy; module.files = proxy;
if (!proxy.drive || typeof(proxy.drive) !== 'object') { proxy.drive = {}; } if (!proxy.drive || typeof(proxy.drive) !== 'object') { proxy.drive = {}; }
migrateAnonDrive(proxy, function () { migrateAnonDrive(proxy, function () {
createReadme(proxy, function () { initLocalStorage();
initLocalStorage(); init(proxy);
init(proxy); APP.userList.onChange();
APP.userList.onChange(); Cryptpad.removeLoadingScreen();
Cryptpad.removeLoadingScreen();
});
}); });
}; };
var onDisconnect = function (info) { var onDisconnect = function (info) {