mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Merge pull request #399 from mattermost/update-dependencies

Просмотр исходного кода 
MM-1908 Update dependencies and switch to Babelify
Этот коммит содержится в:
Joram Wilander
2015-08-19 09:01:14 -04:00
родитель 7004a348b5 c54ecdac89
Коммит 104f4a5ad8
4 изменённых файлов: 298 добавлений и 190 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

287
web/react/.eslintrc
Просмотреть файл

@@ -1,139 +1,160 @@
{ {
"ecmaFeatures": { "extends": "eslint:recommended",
"jsx": true, "ecmaFeatures": {
"blockBindings": true, "jsx": true,
"modules": true "blockBindings": true,
}, "modules": true,
"plugins": [ "classes": true
"react" },
], "plugins": [
"env": { "react"
"browser": true, ],
"node": true, "env": {
"jquery": true, "browser": true,
"es6": true "node": true,
}, "jquery": true,
"globals": { "es6": true
"React": false },
}, "globals": {
"rules": { "React": false
"comma-dangle": [2, "never"], },
"no-cond-assign": [2, "except-parens"], "rules": {
"no-console": 1, "comma-dangle": [2, "never"],
"no-constant-condition": 1, "no-cond-assign": [2, "except-parens"],
"no-debugger": 1, "no-console": 1,
"no-dupe-args": 2, "no-constant-condition": 1,
"no-dupe-keys": 2, "no-debugger": 1,
"no-duplicate-case": 2, "no-dupe-args": 2,
"no-empty": 1, "no-dupe-keys": 2,
"no-ex-assign": 1, "no-duplicate-case": 2,
"no-extra-semi": 2, "no-empty": 1,
"no-func-assign": 1, "no-ex-assign": 1,
"no-inner-declarations": 0, "no-extra-semi": 2,
"no-invalid-regexp": 2, "no-func-assign": 1,
"no-irregular-whitespace": 2, "no-inner-declarations": 0,
"no-unreachable": 2, "no-invalid-regexp": 2,
"valid-typeof": 2, "no-irregular-whitespace": 2,
"no-unexpected-multiline": 2, "no-unreachable": 2,
"valid-typeof": 2,
"no-unexpected-multiline": 2,
"block-scoped-var": 1, "block-scoped-var": 1,
"complexity": [1, 8], "complexity": [1, 8],
"consistent-return": 2, "consistent-return": 2,
"curly": [2, "all"], "curly": [2, "all"],
"dot-notation": 2, "dot-notation": 2,
"dot-location": [2, "object"], "dot-location": [2, "object"],
"eqeqeq": [2, "smart"], "eqeqeq": [2, "smart"],
"guard-for-in": 1, "guard-for-in": 1,
"no-alert": 1, "no-alert": 1,
"no-caller": 2, "no-array-constructor": 2,
"no-div-regex": 1, "no-caller": 2,
"no-else-return": 1, "no-div-regex": 1,
"no-eval": 2, "no-else-return": 1,
"no-extend-native": 2, "no-eval": 2,
"no-floating-decimal": 2, "no-extend-native": 2,
"no-labels": 2, "no-extra-bind": 2,
"no-lone-blocks": 1, "no-floating-decimal": 2,
"no-multi-spaces": [2, { "exceptions": { "Property": false } }], "no-implied-eval": 2,
"no-multi-str": 0, "no-iterator": 2,
"no-param-reassign": 2, "no-labels": 2,
"no-process-env": 2, "no-lone-blocks": 1,
"no-redeclare": 2, "no-loop-func": 2,
"no-return-assign": [2, "always"], "no-multi-spaces": [2, { "exceptions": { "Property": false } }],
"no-script-url": 2, "no-multi-str": 0,
"no-self-compare": 2, "no-native-reassign": 2,
"no-sequences": 2, "no-new": 2,
"no-throw-literal": 2, "no-new-func": 2,
"no-unused-expressions": 2, "no-new-object": 2,
"no-void": 2, "no-new-wrappers": 2,
"no-warning-comments": 0, "no-octal-escape": 2,
"no-with": 2, "no-param-reassign": 2,
"radix": 2, "no-process-env": 2,
"vars-on-top": 0, "no-process-exit": 2,
"wrap-iife": [2, "outside"], "no-proto": 2,
"yoda": [2, "never", {"exceptRange": false, "onlyEquality": false}], "no-redeclare": 2,
"no-return-assign": [2, "always"],
"no-script-url": 2,
"no-self-compare": 2,
"no-sequences": 2,
"no-throw-literal": 2,
"no-unused-expressions": 2,
"no-undef-init": 2,
"no-void": 2,
"no-warning-comments": 0,
"no-with": 2,
"radix": 2,
"vars-on-top": 0,
"wrap-iife": [2, "outside"],
"yoda": [2, "never", {"exceptRange": false, "onlyEquality": false}],
"no-undefined": 2, "no-undefined": 2,
"no-shadow": [2, {"hoist": "functions"}], "no-shadow": [2, {"hoist": "functions"}],
"no-unused-vars": [2, {"vars": "all", "args": "all"}], "no-shadow-restricted-names": 2,
"no-use-before-define": [2, "nofunc"], "no-unused-vars": [2, {"vars": "all", "args": "after-used"}],
"no-use-before-define": [2, "nofunc"],
// Style // Style
"array-bracket-spacing": [2, "never"], "array-bracket-spacing": [2, "never"],
"brace-style": [2, "1tbs", { "allowSingleLine": false }], "brace-style": [2, "1tbs", { "allowSingleLine": false }],
"camelcase": [2, {"properties": "always"}], "camelcase": [2, {"properties": "always"}],
"comma-spacing": [2, {"before": false, "after": true}], "comma-spacing": [2, {"before": false, "after": true}],
"comma-style": [2, "last"], "comma-style": [2, "last"],
"computed-property-spacing": [2, "never"], "computed-property-spacing": [2, "never"],
"consistent-this": [2, "self"], "consistent-this": [2, "self"],
"func-names": 2, "func-names": 2,
"func-style": [2, "declaration"], "func-style": [2, "declaration"],
"indent": [2, 4, {"indentSwitchCase": false}], "indent": [2, 4, {"SwitchCase": 0}],
"key-spacing": [2, {"beforeColon": false, "afterColon": true}], "key-spacing": [2, {"beforeColon": false, "afterColon": true}],
"lines-around-comment": [2, { "beforeBlockComment": true, "beforeLineComment": true, "allowBlockStart": true, "allowBlockEnd": true }], "lines-around-comment": [2, { "beforeBlockComment": true, "beforeLineComment": true, "allowBlockStart": true, "allowBlockEnd": true }],
"linebreak-style": 2, "linebreak-style": 2,
"new-cap": 2, "new-cap": 2,
"new-parens": 2, "new-parens": 2,
"no-lonely-if": 2, "no-lonely-if": 2,
"no-mixed-spaces-and-tabs": 2, "no-mixed-spaces-and-tabs": 2,
"no-multiple-empty-lines": [2, {"max": 1}], "no-multiple-empty-lines": [2, {"max": 1}],
"no-spaced-func": 2, "no-spaced-func": 2,
"no-ternary": 2, "no-ternary": 2,
"no-trailing-spaces": [2, { "skipBlankLines": false }], "no-trailing-spaces": [2, { "skipBlankLines": false }],
"no-underscore-dangle": 2, "no-underscore-dangle": 2,
"no-unneeded-ternary": 2, "no-unneeded-ternary": 2,
"object-curly-spacing": [2, "never"], "object-curly-spacing": [2, "never"],
"one-var": [2, "never"], "one-var": [2, "never"],
"operator-linebreak": [2, "after"], "operator-linebreak": [2, "after"],
"padded-blocks": [2, "never"], "padded-blocks": [2, "never"],
"quote-props": [2, "as-needed"], "quote-props": [2, "as-needed"],
"quotes": [2, "single", "avoid-escape"], "quotes": [2, "single", "avoid-escape"],
"semi-spacing": [2, {"before": false, "after": true}], "semi-spacing": [2, {"before": false, "after": true}],
"semi": [2, "always"], "semi": [2, "always"],
"space-after-keywords": [2, "always"], "space-after-keywords": [2, "always"],
"space-before-blocks": [2, "always"], "space-before-blocks": [2, "always"],
"space-before-function-paren": [2, "never"], "space-before-function-paren": [2, "never"],
"space-in-parens": [2, "never"], "space-in-parens": [2, "never"],
"space-infix-ops": 2, "space-infix-ops": 2,
"space-return-throw-case": 2, "space-return-throw-case": 2,
"space-unary-ops": [2, { "words": true, "nonwords": false }], "space-unary-ops": [2, { "words": true, "nonwords": false }],
"wrap-regex": 2, "wrap-regex": 2,
// React Specific // React Specific
"react/display-name": [2, { "acceptTranspilerName": true }], "react/display-name": [2, { "acceptTranspilerName": true }],
"react/jsx-boolean-value": [2, "always"], "react/jsx-boolean-value": [2, "always"],
"react/jsx-curly-spacing": [2, "never"], "react/jsx-curly-spacing": [2, "never"],
"react/jsx-no-duplicate-props": [2, { "ignoreCase": false }], "react/jsx-max-props-per-line": [2, { "maximum": 1 }],
"react/jsx-no-undef": 2, // SOON "react/jsx-indent-props": [2, 4],
"react/jsx-quotes": [2, "single", "avoid-escape"], "react/jsx-no-duplicate-props": [2, { "ignoreCase": false }],
"react/jsx-uses-react": 2, "react/jsx-no-literals": 0,
"react/jsx-uses-vars": 2, "react/jsx-no-undef": 2,
"react/no-danger": 0, "react/jsx-quotes": [2, "single", "avoid-escape"],
"react/no-did-mount-set-state": 2, "react/jsx-uses-react": 2,
"react/no-did-update-set-state": 2, "react/jsx-uses-vars": 2,
"react/no-multi-comp": 2, "react/no-danger": 0,
"react/no-unknown-property": 2, "react/no-did-mount-set-state": 2,
"react/prop-types": 2, "react/no-did-update-set-state": 2,
"react/sort-comp": 0, "react/no-multi-comp": 2,
"react/wrap-multilines": 2 "react/no-unknown-property": 2,
} "react/prop-types": 2,
"react/sort-comp": 0,
"react/self-closing-comp": 2,
"react/wrap-multilines": 2
}
} }

3
web/react/components/post.jsx
Просмотреть файл

@@ -3,7 +3,6 @@
var PostHeader = require('./post_header.jsx'); var PostHeader = require('./post_header.jsx');
var PostBody = require('./post_body.jsx'); var PostBody = require('./post_body.jsx');
var PostInfo = require('./post_info.jsx');
var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
var Constants = require('../utils/constants.jsx'); var Constants = require('../utils/constants.jsx');
var UserStore = require('../stores/user_store.jsx'); var UserStore = require('../stores/user_store.jsx');
@@ -13,6 +12,8 @@ var client = require('../utils/client.jsx');
var AsyncClient = require('../utils/async_client.jsx'); var AsyncClient = require('../utils/async_client.jsx');
var ActionTypes = Constants.ActionTypes; var ActionTypes = Constants.ActionTypes;
var PostInfo = require('./post_info.jsx');
module.exports = React.createClass({ module.exports = React.createClass({
displayName: "Post", displayName: "Post",
handleCommentClick: function(e) { handleCommentClick: function(e) {

171
web/react/components/post_info.jsx
Просмотреть файл

@@ -6,11 +6,18 @@ var utils = require('../utils/utils.jsx');
var Constants = require('../utils/constants.jsx'); var Constants = require('../utils/constants.jsx');
module.exports = React.createClass({ export default class PostInfo extends React.Component {
getInitialState: function() { constructor(props) {
return { }; super(props);
}, this.state = {};
render: function() { }
shouldShowComment(state, type, isOwner) {
if (state === Constants.POST_FAILED || state === Constants.POST_LOADING) {
return false;
}
return isOwner || (this.props.allowReply === 'true' && type !== 'Comment');
}
createDropdown() {
var post = this.props.post; var post = this.props.post;
var isOwner = UserStore.getCurrentId() === post.user_id; var isOwner = UserStore.getCurrentId() === post.user_id;
var isAdmin = UserStore.getCurrentUser().roles.indexOf('admin') > -1; var isAdmin = UserStore.getCurrentUser().roles.indexOf('admin') > -1;
@@ -20,6 +27,89 @@ module.exports = React.createClass({
type = 'Comment'; type = 'Comment';
} }
if (!this.shouldShowComment(post.state, type, isOwner)) {
return '';
}
var dropdownContents = [];
var dataComments = 0;
if (type === 'Post') {
dataComments = this.props.commentCount;
}
if (isOwner) {
dropdownContents.push(
<li role='presentation'>
<a
href='#'
role='menuitem'
data-toggle='modal'
data-target='#edit_post'
data-title={type}
data-message={post.message}
data-postid={post.id}
data-channelid={post.channel_id}
data-comments={dataComments}
>
Edit
</a>
</li>
);
}
if (isOwner || isAdmin) {
dropdownContents.push(
<li role='presentation'>
<a
href='#'
role='menuitem'
data-toggle='modal'
data-target='#delete_post'
data-title={type}
data-postid={post.id}
data-channelid={post.channel_id}
data-comments={dataComments}
>
Delete
</a>
</li>
);
}
if (this.props.allowReply === 'true') {
dropdownContents.push(
<li role='presentation'>
<a
className='reply-link theme'
href='#'
onClick={this.props.handleCommentClick}
>
Reply
</a>
</li>
);
}
return (
<div>
<a
href='#'
className='dropdown-toggle theme'
type='button'
data-toggle='dropdown'
aria-expanded='false'
/>
<ul
className='dropdown-menu'
role='menu'
>
{dropdownContents}
</ul>
</div>
);
}
render() {
var post = this.props.post;
var comments = ''; var comments = '';
var lastCommentClass = ' comment-icon__container__hide'; var lastCommentClass = ' comment-icon__container__hide';
if (this.props.isLastComment) { if (this.props.isLastComment) {
@@ -27,47 +117,30 @@ module.exports = React.createClass({
} }
if (this.props.commentCount >= 1 && post.state !== Constants.POST_FAILED && post.state !== Constants.POST_LOADING) { if (this.props.commentCount >= 1 && post.state !== Constants.POST_FAILED && post.state !== Constants.POST_LOADING) {
comments = <a href='#' className={'comment-icon__container theme' + lastCommentClass} onClick={this.props.handleCommentClick}><span className='comment-icon' dangerouslySetInnerHTML={{__html: Constants.COMMENT_ICON}} />{this.props.commentCount}</a>; comments = (
} <a
href='#'
var showDropdown = isOwner || (this.props.allowReply === 'true' && type !== 'Comment'); className={'comment-icon__container theme' + lastCommentClass}
if (post.state === Constants.POST_FAILED || post.state === Constants.POST_LOADING) { onClick={this.props.handleCommentClick}
showDropdown = false; >
} <span
className='comment-icon'
var dropdownContents = []; dangerouslySetInnerHTML={{__html: Constants.COMMENT_ICON}}
var dropdown; />
if (showDropdown) { {this.props.commentCount}
var dataComments = 0; </a>
if (type === 'Post') {
dataComments = this.props.commentCount;
}
if (isOwner) {
dropdownContents.push(<li role='presentation'><a href='#' role='menuitem' data-toggle='modal' data-target='#edit_post' data-title={type} data-message={post.message} data-postid={post.id} data-channelid={post.channel_id} data-comments={dataComments}>Edit</a></li>);
}
if (isOwner || isAdmin) {
dropdownContents.push(<li role='presentation'><a href='#' role='menuitem' data-toggle='modal' data-target='#delete_post' data-title={type} data-postid={post.id} data-channelid={post.channel_id} data-comments={dataComments}>Delete</a></li>);
}
if (this.props.allowReply === 'true') {
dropdownContents.push(<li role='presentation'><a className='reply-link theme' href='#' onClick={this.props.handleCommentClick}>Reply</a></li>);
}
dropdown = (
<div>
<a href='#' className='dropdown-toggle theme' type='button' data-toggle='dropdown' aria-expanded='false' />
<ul className='dropdown-menu' role='menu'>
{dropdownContents}
</ul>
</div>
); );
} }
var dropdown = this.createDropdown();
return ( return (
<ul className='post-header post-info'> <ul className='post-header post-info'>
<li className='post-header-col'><time className='post-profile-time'>{utils.displayDateTime(post.create_at)}</time></li> <li className='post-header-col'>
<time className='post-profile-time'>
{utils.displayDateTime(post.create_at)}
</time>
</li>
<li className='post-header-col post-header__reply'> <li className='post-header-col post-header__reply'>
<div className='dropdown'> <div className='dropdown'>
{dropdown} {dropdown}
@@ -77,4 +150,18 @@ module.exports = React.createClass({
</ul> </ul>
); );
} }
}); }
PostInfo.defaultProps = {
post: null,
commentCount: 0,
isLastComment: false,
allowReply: false
};
PostInfo.propTypes = {
post: React.PropTypes.object,
commentCount: React.PropTypes.number,
isLastComment: React.PropTypes.bool,
allowReply: React.PropTypes.string,
handleCommentClick: React.PropTypes.func
};

27
web/react/package.json
Просмотреть файл

@@ -3,22 +3,21 @@
"version": "0.0.1", "version": "0.0.1",
"private": true, "private": true,
"dependencies": { "dependencies": {
"flux": "^2.0.0", "autolinker": "^0.18.1",
"keymirror": "~0.1.0", "flux": "^2.1.1",
"object-assign": "^1.0.0", "keymirror": "^0.1.1",
"react": "^0.12.0", "object-assign": "^3.0.0",
"autolinker": "^0.15.2", "react": "^0.13.3",
"react-zeroclipboard-mixin": "^0.1.0" "react-zeroclipboard-mixin": "^0.1.0"
}, },
"devDependencies": { "devDependencies": {
"browserify": "^6.2.0", "browserify": "^11.0.1",
"envify": "^3.0.0", "envify": "^3.4.0",
"jest-cli": "~0.1.17", "babelify": "^6.1.3",
"reactify": "^0.15.2", "uglify-js": "^2.4.24",
"uglify-js": "~2.4.15", "watchify": "^3.3.1",
"watchify": "^2.1.1", "eslint": "^1.1.0",
"eslint": "^0.24.1", "eslint-plugin-react": "^3.2.3"
"eslint-plugin-react": "^3.0.0"
}, },
"scripts": { "scripts": {
"start": "watchify --extension=jsx -o ../static/js/bundle.js -v -d ./**/*.jsx", "start": "watchify --extension=jsx -o ../static/js/bundle.js -v -d ./**/*.jsx",
@@ -28,7 +27,7 @@
}, },
"browserify": { "browserify": {
"transform": [ "transform": [
"reactify", ["babelify", {"blacklist": ["strict"]}],
"envify" "envify"
] ]
}, },