diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-09-30 11:06:30 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-30 11:06:30 -0400 |
commit | 8a0e649f989a824bb3bbfd1900a5b8e5383b47e1 (patch) | |
tree | 4b424929fe13ebec438d2f41a2729e37e5160720 /webapp/components/code_preview.jsx | |
parent | a2deeed597dea15d9b7ca237be71988469f58cdd (diff) | |
download | chat-8a0e649f989a824bb3bbfd1900a5b8e5383b47e1.tar.gz chat-8a0e649f989a824bb3bbfd1900a5b8e5383b47e1.tar.bz2 chat-8a0e649f989a824bb3bbfd1900a5b8e5383b47e1.zip |
PLT-3105 Files table migration (#4068)
* Implemented initial changes for files table
* Removed *_benchmark_test.go files
* Re-implemented GetPublicFile and added support for old path
* Localization for files table
* Moved file system code into utils package
* Finished server-side changes and added initial upgrade script
* Added getPostFiles api
* Re-add Extension and HasPreviewImage fields to FileInfo
* Removed unused translation
* Fixed merge conflicts left over after permissions changes
* Forced FileInfo.extension to be lower case
* Changed FileUploadResponse to contain the FileInfos instead of FileIds
* Fixed permissions on getFile* calls
* Fixed notifications for file uploads
* Added initial version of client code for files changes
* Permanently added FileIds field to Post object and removed Post.HasFiles
* Updated PostStore.Update to be usable in more circumstances
* Re-added Filenames field and switched file migration to be entirely lazy-loaded
* Increased max listener count for FileStore
* Removed unused fileInfoCache
* Moved file system code back into api
* Removed duplicate test case
* Fixed unit test running on ports other than 8065
* Renamed HasPermissionToPostContext to HasPermissionToChannelByPostContext
* Refactored handleImages to make it more easily understandable
* Renamed getPostFiles to getFileInfosForPost
* Re-added pre-FileIds posts to analytics
* Changed files to be saved as their ids as opposed to id/filename.ext
* Renamed FileInfo.UserId to FileInfo.CreatorId
* Fixed detection of language in CodePreview
* Fixed switching between threads in the RHS not loading new files
* Add serverside protection against a rare bug where the client sends the same file twice for a single post
* Refactored the important parts of uploadFile api call into a function that can be called without a web context
Diffstat (limited to 'webapp/components/code_preview.jsx')
-rw-r--r-- | webapp/components/code_preview.jsx | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/webapp/components/code_preview.jsx b/webapp/components/code_preview.jsx index 6625f45f4..852b26e25 100644 --- a/webapp/components/code_preview.jsx +++ b/webapp/components/code_preview.jsx @@ -38,7 +38,7 @@ export default class CodePreview extends React.Component { } updateStateFromProps(props) { - var usedLanguage = SyntaxHighlighting.getLanguageFromFilename(props.filename); + const usedLanguage = SyntaxHighlighting.getLanguageFromFileExtension(props.fileInfo.extension); if (!usedLanguage || props.fileInfo.size > Constants.CODE_PREVIEW_MAX_FILE_SIZE) { this.setState({code: '', lang: '', loading: false, success: false}); @@ -64,8 +64,8 @@ export default class CodePreview extends React.Component { this.setState({loading: false, success: false}); } - static support(filename) { - return Boolean(SyntaxHighlighting.getLanguageFromFilename(filename)); + static supports(fileInfo) { + return Boolean(SyntaxHighlighting.getLanguageFromFileExtension(fileInfo.extension)); } render() { @@ -83,10 +83,8 @@ export default class CodePreview extends React.Component { if (!this.state.success) { return ( <FileInfoPreview - filename={this.props.filename} - fileUrl={this.props.fileUrl} fileInfo={this.props.fileInfo} - formatMessage={this.props.formatMessage} + fileUrl={this.props.fileUrl} /> ); } @@ -106,12 +104,10 @@ export default class CodePreview extends React.Component { const highlighted = SyntaxHighlighting.highlight(this.state.lang, this.state.code); - const fileName = this.props.filename.substring(this.props.filename.lastIndexOf('/') + 1, this.props.filename.length); - return ( <div className='post-code'> <span className='post-code__language'> - {`${fileName} - ${language}`} + {`${this.props.fileInfo.name} - ${language}`} </span> <code className='hljs'> <table> @@ -129,8 +125,6 @@ export default class CodePreview extends React.Component { } CodePreview.propTypes = { - filename: React.PropTypes.string.isRequired, - fileUrl: React.PropTypes.string.isRequired, fileInfo: React.PropTypes.object.isRequired, - formatMessage: React.PropTypes.func.isRequired + fileUrl: React.PropTypes.string.isRequired }; |