OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4163 from matrix-org/t3chguy/double_download 

only automatically download in usercontent if user requested it
pull/21833/head
Michael Telatynski 2020-03-03 14:22:54 +00:00 committed by GitHub
parent ca274dde4a c0b68ccd53
commit b23eaa1ce7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/messages/MFileBody.js
View File

@ -271,6 +271,8 @@ export default createReactClass({
// We can't provide a Content-Disposition header like we would for HTTP. // We can't provide a Content-Disposition header like we would for HTTP.
download: fileName, download: fileName,
textContent: _t("Download %(text)s", { text: text }), textContent: _t("Download %(text)s", { text: text }),
// only auto-download if a user triggered this iframe explicitly
auto: !this.props.decryptedBlob,
}, "*"); }, "*");
}; };

5
src/usercontent/index.js
View File

@ -27,7 +27,10 @@ function remoteRender(event) {
// Don't display scrollbars if the link takes more than one line to display. // Don't display scrollbars if the link takes more than one line to display.
body.style = "margin: 0px; overflow: hidden"; body.style = "margin: 0px; overflow: hidden";
body.appendChild(a); body.appendChild(a);
a.click(); // try to trigger download automatically
if (event.data.auto) {
a.click(); // try to trigger download automatically
}
} }
function remoteSetTint(event) { function remoteSetTint(event) {