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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
yflory 2018-02-08 12:24:49 +01:00
commit c9243b7b46
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/drive/inner.js
View File

@ -2673,11 +2673,14 @@ define([
var data = JSON.parse(JSON.stringify(filesOp.getFileData(el))); var data = JSON.parse(JSON.stringify(filesOp.getFileData(el)));
if (!data || !data.href) { return void cb('INVALID_FILE'); } if (!data || !data.href) { return void cb('INVALID_FILE'); }
data.href = base + data.href; data.href = base + data.href;
var roUrl;
if (ro) { if (ro) {
data.roHref = data.href; data.roHref = data.href;
delete data.href; delete data.href;
} else { } else {
data.roHref = base + getReadOnlyUrl(el); roUrl = getReadOnlyUrl(el);
if (roUrl) { data.roHref = base + roUrl; }
} }
UIElements.getProperties(common, data, cb); UIElements.getProperties(common, data, cb);