MM-14484 Remove download attribute from Open external image link (mat…

…termost#2655)
jespino · Apr 15, 2019 · efe092a · efe092a
1 parent cf1eca3
commit efe092a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/components/view_image/popover_bar/__snapshots__/popover_bar.test.jsx.snap b/components/view_image/popover_bar/__snapshots__/popover_bar.test.jsx.snap
@@ -23,7 +23,6 @@ exports[`components/view_image/popover_bar/PopoverBar should match snapshot for
  >
  <a
  className="text"
- download="img.png"
  href=""
  rel="noopener noreferrer"
  target="_blank"

diff --git a/components/view_image/popover_bar/popover_bar.jsx b/components/view_image/popover_bar/popover_bar.jsx
@@ -57,8 +57,11 @@ export default class PopoverBar extends React.PureComponent {
 
  let downloadLinks = null;
  if (this.props.canDownloadFiles) {
+ const shouldOpenFile = this.props.isExternalFile && !this.props.isDesktopApp;
+
  let downloadLinkText;
- if (this.props.isExternalFile && !this.props.isDesktopApp) {
+ const downloadLinkProps = {};
+ if (shouldOpenFile) {
  downloadLinkText = (
  <FormattedMessage
  id='view_image_popover.open'
@@ -72,17 +75,19 @@ export default class PopoverBar extends React.PureComponent {
  defaultMessage='Download'
  />
  );
+
+ downloadLinkProps.download = this.props.filename;
  }
 
  downloadLinks = (
  <div className='image-links'>
  {publicLink}
  <a
  href={this.props.fileURL}
- download={this.props.filename}
  className='text'
  target='_blank'
  rel='noopener noreferrer'
+ {...downloadLinkProps}
  >
  {downloadLinkText}
  </a>