summaryrefslogtreecommitdiffstats
path: root/web/react/components/view_image.jsx
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-02-22 10:54:42 -0500
committerHarrison Healey <harrisonmhealey@gmail.com>2016-02-22 10:54:42 -0500
commit32ae72d91d31699899d5e2084cf7faa40c81e42c (patch)
tree7e5e2f7ed7a1d2edca368ca91bd8416336a6cedf /web/react/components/view_image.jsx
parent51680a7cd84661340cb727fea09b99d5350d9160 (diff)
parent4c92a1c1e35402730f74cf24a0c71729f4d0a676 (diff)
downloadchat-32ae72d91d31699899d5e2084cf7faa40c81e42c.tar.gz
chat-32ae72d91d31699899d5e2084cf7faa40c81e42c.tar.bz2
chat-32ae72d91d31699899d5e2084cf7faa40c81e42c.zip
Merge pull request #2208 from mattermost/client-upgrades
Updating some client deps + eslint
Diffstat (limited to 'web/react/components/view_image.jsx')
-rw-r--r--web/react/components/view_image.jsx18
1 files changed, 16 insertions, 2 deletions
diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx
index 90885e495..713fbf80b 100644
--- a/web/react/components/view_image.jsx
+++ b/web/react/components/view_image.jsx
@@ -203,7 +203,9 @@ class ViewImageModal extends React.Component {
window.open(serverData.public_link);
}
},
- () => {}
+ () => {
+ //Do Nothing on error
+ }
);
}
@@ -383,6 +385,11 @@ function LoadingImagePreview({progress, loading}) {
);
}
+LoadingImagePreview.propTypes = {
+ progress: React.PropTypes.number,
+ loading: React.PropTypes.string
+};
+
function ImagePreview({filename, fileUrl, fileInfo, maxHeight}) {
let previewUrl;
if (fileInfo.has_preview_image) {
@@ -405,4 +412,11 @@ function ImagePreview({filename, fileUrl, fileInfo, maxHeight}) {
);
}
-export default injectIntl(ViewImageModal); \ No newline at end of file
+ImagePreview.propTypes = {
+ filename: React.PropTypes.string.isRequired,
+ fileUrl: React.PropTypes.string.isRequired,
+ fileInfo: React.PropTypes.object.isRequired,
+ maxHeight: React.PropTypes.number.isRequired
+};
+
+export default injectIntl(ViewImageModal);