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

Fix XXX

Browse Source
This commit is contained in:
yflory
2018-07-17 15:38:23 +02:00
parent b4c294565e
commit 6143bceabb
7 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/proxy-manager.js
View File

@@ -252,7 +252,7 @@ define([
var resolved = _resolvePaths(Env, data.paths);
var newResolved = _resolvePath(Env, data.newPath);
if (!newResolved.userObject.isFolder(newResolved.path)) { return void cb(); } // XXX
if (!newResolved.userObject.isFolder(newResolved.path)) { return void cb(); }
nThen(function (waitFor) {
if (resolved.main.length) {
@@ -384,7 +384,7 @@ define([
// 2b. load the proxy
Env.loadSharedFolder(id, folderData, waitFor(function (rt, metadata) {
if (!rt.proxy.metadata) { // Creating a new shared folder
rt.proxy.metadata = {title: data.name || Messages.fm_newFolder}; // XXX
rt.proxy.metadata = { title: data.name || Messages.fm_newFolder };
}
// If we're importing a folder, check its serverside metadata
if (data.folderData && metadata) {