IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update mattermost-redux to master (#6982)

Browse Source
This commit is contained in:
Joram Wilander
2017-07-20 08:56:23 -04:00
committed by Harrison Healey
parent 9731eb4764
commit 5ae701d133
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webapp/components/file_attachment_list/index.js
View File

@@ -11,7 +11,8 @@ import FileAttachmentList from './file_attachment_list.jsx';
function makeMapStateToProps() {
const selectFilesForPost = makeGetFilesForPost();
return function mapStateToProps(state, ownProps) {
const fileInfos = selectFilesForPost(state, ownProps.post);
const postId = ownProps.post ? ownProps.post.id : '';
const fileInfos = selectFilesForPost(state, postId);
let fileCount = 0;
if (ownProps.post.file_ids) {

2
webapp/components/post_view/commented_on_files_message/commented_on_files_message.jsx
View File

@@ -45,7 +45,7 @@ export default class CommentedOnFilesMessage extends React.PureComponent {
id='post_body.plusMore'
defaultMessage=' plus {count, number} other {count, plural, one {file} other {files}}'
values={{
count: this.props.fileInfos.length
count: this.props.fileInfos.length - 1
}}
/>
);

2
webapp/components/post_view/commented_on_files_message/index.js
View File

@@ -15,7 +15,7 @@ function makeMapStateToProps() {
return function mapStateToProps(state, ownProps) {
let fileInfos;
if (ownProps.parentPostId) {
fileInfos = selectFileInfosForPost(state, {id: ownProps.parentPostId});
fileInfos = selectFileInfosForPost(state, ownProps.parentPostId);
}
return {

2
webapp/package.json
View File

@@ -25,7 +25,7 @@
"localforage": "1.5.0",
"marked": "mattermost/marked#c0b5f4a651b0af63e974522b20b93b7999490c53",
"match-at": "0.1.0",
"mattermost-redux": "mattermost/mattermost-redux#webapp-4.0",
"mattermost-redux": "mattermost/mattermost-redux#master",
"object-assign": "4.1.1",
"pdfjs-dist": "1.8.557",
"perfect-scrollbar": "0.7.1",

4
webapp/yarn.lock
View File

@@ -5088,9 +5088,9 @@ math-expression-evaluator@^1.2.14:
version "1.2.16"
resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.16.tgz#b357fa1ca9faefb8e48d10c14ef2bcb2d9f0a7c9"
mattermost-redux@mattermost/mattermost-redux#webapp-4.0:
mattermost-redux@mattermost/mattermost-redux#master:
version "0.0.1"
resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/ea67cb97d1e34b251e13a356583223284f544aa5"
resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/f8d106e6fde0d8633bf5d13c1ca1aaec61b0b8bb"
dependencies:
deep-equal "1.0.1"
harmony-reflect "1.5.1"