diff --git a/.babelrc b/.babelrc index ca2e2cead..41d27bf34 100644 --- a/.babelrc +++ b/.babelrc @@ -1,16 +1,15 @@ { "sourceMaps": true, "presets": [ - "stage-0", "es2015" ], "plugins": [ - ["transform-decorators-legacy"], - ["transform-react-jsx"], - ["transform-object-assign"], - ["transform-class-properties"], - ["transform-async-to-generator"], - ["transform-object-rest-spread"], - ["transform-class-properties"] + "add-module-exports", + "transform-async-to-generator", + "transform-class-properties", + "transform-decorators-legacy", + "transform-object-assign", + "transform-object-rest-spread", + "transform-react-jsx" ] } diff --git a/.eslintrc.json b/.eslintrc.json index 035a86189..d99b2254b 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -21,6 +21,8 @@ "no-eval": [2], "no-global-assign": [2], "no-implied-eval": [2], + "lines-around-comment": ["warn", {"beforeLineComment": true}], + "spaced-comment": ["warn", "always", { "line": { "exceptions": ["-", "="] } }], "no-script-url": [2], "no-throw-literal": [2], "yoda": [1], diff --git a/app.js b/app.js index 15a7a5442..79d09db65 100644 --- a/app.js +++ b/app.js @@ -22,6 +22,7 @@ if (app.get('env') !== 'test') { //============================================================================== app.set('trust proxy', 1); + // We disable frameward on helmet to allow crossdomain injection of the embed app.use(helmet({ frameguard: false diff --git a/bin/cli-serve b/bin/cli-serve index c22920eaa..5478b7c1e 100755 --- a/bin/cli-serve +++ b/bin/cli-serve @@ -60,11 +60,13 @@ function normalizePort(val) { let port = parseInt(val, 10); if (isNaN(port)) { + // named pipe return val; } if (port >= 0) { + // port number return port; } diff --git a/client/coral-admin/src/components/Comment.js b/client/coral-admin/src/components/Comment.js index 4a21b0846..84c0e0541 100644 --- a/client/coral-admin/src/components/Comment.js +++ b/client/coral-admin/src/components/Comment.js @@ -30,7 +30,7 @@ export default props => {
{links ? Contains Link : null} -
+
{props.actions.map((action, i) => getActionButton(action, i, props))}
@@ -63,19 +63,21 @@ const getActionButton = (action, i, props) => { if (action === 'ban') { return ( ); } return ( props.onClickAction(props.actionsMap[action].status, comment.id)} /> diff --git a/client/coral-admin/src/components/CommentList.js b/client/coral-admin/src/components/CommentList.js index 8c6655bb5..39de5121b 100644 --- a/client/coral-admin/src/components/CommentList.js +++ b/client/coral-admin/src/components/CommentList.js @@ -31,6 +31,7 @@ export default class CommentList extends React.Component { // add key handlers and gestures componentDidMount () { this.bindKeyHandlers(); + // this.bindGestures() // need to check whether we're on a mobile device or this throws an Error } @@ -80,6 +81,7 @@ export default class CommentList extends React.Component { const {commentIds} = this.props; const {active} = this.state; + // check boundaries if (active === null || !commentIds.length) { this.setState({active: commentIds[0]}); @@ -102,6 +104,7 @@ export default class CommentList extends React.Component { // TODO: In the future this can be improved and look at the actual state to // resolve since the content of the list could change externally. For now it works as expected onClickAction (action, id, author_id) { + // activate the next comment if (id === this.state.active) { const {commentIds} = this.props; @@ -123,7 +126,10 @@ export default class CommentList extends React.Component { const {active} = this.state; return ( -