Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

[ICU-648] Fix download tooltip #692

Merged
merged 4 commits into from
Feb 6, 2018
Merged

[ICU-648] Fix download tooltip #692

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
562a7f5
fix download tooltip
saturninoabril Jan 31, 2018
cb6ece9
change text to `Download` only and change tooltip position closer to …
saturninoabril Feb 2, 2018
515e65a
fix conflicts
saturninoabril Feb 5, 2018
92cd8e0
removed unnecessary props and add constant for max filename length
saturninoabril Feb 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix conflicts
  • Loading branch information
@saturninoabril
saturninoabril committed Feb 5, 2018
commit 515e65a2331f8109c8daa8773413f1ea9a9de982
2 changes: 1 addition & 1 deletion components/file_attachment.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import {getFileThumbnailUrl, getFileUrl} from 'mattermost-redux/utils/file_utils';

import Constants, {FileTypes} from 'utils/constants.jsx';
import {FileTypes} from 'utils/constants.jsx';
import {
canDownloadFiles,
trimFilename
Expand Down
6 changes: 3 additions & 3 deletions components/file_attachment/file_thumbnail.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import React from 'react';

import {getFileThumbnailUrl, getFileUrl} from 'mattermost-redux/utils/file_utils';

import Constants from 'utils/constants.jsx';
import Constants, {FileTypes} from 'utils/constants.jsx';
import {
getFileType,
getIconClassName,
Expand All @@ -28,7 +28,7 @@ export default class FileThumbnail extends React.PureComponent {
const type = getFileType(fileInfo.extension);

let thumbnail;
if (type === 'image') {
if (type === FileTypes.IMAGE) {
let className = 'post-image';

if (fileInfo.width < Constants.THUMBNAIL_WIDTH && fileInfo.height < Constants.THUMBNAIL_HEIGHT) {
Expand All @@ -51,7 +51,7 @@ export default class FileThumbnail extends React.PureComponent {
}}
/>
);
} else if (fileInfo.extension === 'svg') {
} else if (fileInfo.extension === FileTypes.SVG) {
thumbnail = (
<img
className='post-image normal'
Expand Down