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

Name a place before creating it in the drive

Browse Source
This commit is contained in:
yflory
2017-01-27 17:51:08 +01:00
parent 02906b3945
commit 5ef074370b
3 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
www/common/cryptpad-common.js
View File

@@ -195,9 +195,11 @@ define([
};
// If we have a hash in the URL specifying a path, it means the document was created from
// the drive and should be stored at the selected path.
if (/#\?path=/.test(window.location.href)) {
var arr = window.location.hash.match(/\?path=(.+)/);
common.initialPath = arr[1] || undefined;
if (/[?&]path=/.test(window.location.hash)) {
var patharr = window.location.hash.match(/[?&]path=([^&]+)/);
var namearr = window.location.hash.match(/[?&]name=([^&]+)/);
common.initialPath = patharr[1] || undefined;
common.initialName = namearr[1] ? decodeURIComponent(namearr[1]) : undefined;
window.location.hash = '';
}
if (!secretHash && !/#/.test(window.location.href)) {
@@ -578,7 +580,7 @@ define([
var data = makePad(href, name);
renamed.push(data);
if (USE_FS_STORE && typeof(getStore().addPad) === "function") {
getStore().addPad(href, common.initialPath, name);
getStore().addPad(href, common.initialPath, common.initialName || name);
}
}